Merge lp:~ltrager/maas-images/canonical_cloudinit into lp:maas-images

[Lee Trager]

Use Canonical's version of cloud-init in the CentOS images.

[lp:~ltrager/maas-images/canonical_cloudinit]

379. By Lee Trager on 2017-07-29

Use Canonical's version of cloud-init in the CentOS images.

[Andres Rodriguez (andreserl)]

review: Approve

[lp:~ltrager/maas-images/canonical_cloudinit]

380. By Lee Trager on 2017-08-01

Ship with a clean /etc/resolv.conf

=== modified file 'bin/maas-qcow2targz'
--- bin/maas-qcow2targz	2017-05-03 11:27:20 +0000
+++ bin/maas-qcow2targz	2017-08-01 02:15:31 +0000
@@ -111,7 +111,6 @@
 
     if [ -n "$packages" ]; then
         # We need working DNS to pull packages from the repo
-        mv "${root_d}/etc/resolv.conf" "${root_d}/etc/resolv.conf.orig"
         cp /etc/resolv.conf "${root_d}/etc/resolv.conf"
         for package in $(echo $packages | sed 's/,/ /g'); do
             LANG=C unshare-pidns chroot "$root_d" yum -y install $package || {
@@ -124,7 +123,12 @@
                 error "failed to clear yum cache"
                 exit 1
             }
-        mv "${root_d}/etc/resolv.conf.orig" "${root_d}/etc/resolv.conf"
+	# Upstream ships with DNS information in /etc/resolv.conf, ship a
+	# clean version.
+	rm "${root_d}/etc/resolv.conf"
+	touch "${root_d}/etc/resolv.conf"
+	chown root:root "${root_d}/etc/resolv.conf"
+	chmod 644 "${root_d}/etc/resolv.conf"
     fi
 
     error "Taring up image contents... into $out"

=== modified file 'conf/centos.yaml'
--- conf/centos.yaml	2017-04-25 01:26:36 +0000
+++ conf/centos.yaml	2017-08-01 02:15:31 +0000
@@ -14,11 +14,19 @@
         release_title: "CentOS 7.0"
         curtin_files: "{curtin_path}/centos7"
         packages:
-         # CentOS 7 removed python-oauth which is required for cloud-init to
-         # authenticate with the MAAS metadata service. Until cloud-init from CentOS
-         # supports python-oauth2 python-oauthlib we need to pull python-oauth from
-         # EPEL7-testing
-         - https://kojipkgs.fedoraproject.org/packages/python-oauth/1.0.1/10.el7/noarch/python-oauth-1.0.1-10.el7.noarch.rpm
+         # cloud-init depends on packages from EPEL
+         - epel-release
+         # XXX ltrager 2017-07-28 - COPR doesn't provide a URL to the latest
+         # package build. Instead it expects you to first add the repo which
+         # is what is included in this package.
+         - https://copr-be.cloud.fedoraproject.org/results/%40cloud-init/el-stable/epel-7-x86_64/00581936-cloud-init-el-release/cloud-init-el-release-7-1.noarch.rpm
+         # The image most likely already has cloud-init, this pulls Canonical's
+         # version
+         - cloud-init
+         # bridge-utils is required by cloud-init to configure networking.
+         # Without it cloud-init will try to install it which will not work in
+         # isolated environments.
+         - bridge-utils
          - linux-firmware
          - grub2-efi-modules
          - efibootmgr
@@ -26,5 +34,19 @@
         version: 6.6
         release_title: "CentOS 6.6"
         curtin_files: "{curtin_path}/centos6"
+        packages:
+         # cloud-init depends on packages from EPEL
+         - epel-release
+         # XXX ltrager 2017-07-28 - COPR doesn't provide a URL to the latest
+         # package build. Instead it expects you to first add the repo which
+         # is what is included in this package.
+         - https://copr-be.cloud.fedoraproject.org/results/%40cloud-init/el-stable/epel-6-x86_64/00581936-cloud-init-el-release/cloud-init-el-release-7-1.noarch.rpm
+         # The image most likely already has cloud-init, this pulls Canonical's
+         # version
+         - cloud-init
+         # bridge-utils is required by cloud-init to configure networking.
+         # Without it cloud-init will try to install it which will not work in
+         # isolated environments.
+         - bridge-utils
 
 # vi: syntax=yaml nowrap