Merge lp:~blake-rouse/maas/fix-1506991 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Prevent a node from contacting MAAS on every reboot.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~blake-rouse/maas/fix-1506991 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Get:2 http://security.ubuntu.com trusty-security/main Sources [97.6 kB]
Get:3 http://security.ubuntu.com trusty-security/universe Sources [31.0 kB]
Get:4 http://security.ubuntu.com trusty-security/main amd64 Packages [351 kB]
Get:5 http://security.ubuntu.com trusty-security/universe amd64 Packages [117 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:6 http://nova.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:7 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [239 kB]
Get:8 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [140 kB]
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [631 kB]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [323 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 2,059 kB in 4s (505 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-pyparsing python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-te...

[Christian Reis (kiko)]

But.. doesn't this prevent us later from doing stuff like changing e-n-i
information?

[Blake Rouse (blake-rouse)]

Kiko,

That I would assume would be a different cloud-init option to provide a webhook to check with MAAS on updating e-n-i. This is different and only a pre-2.0 cloud-init thing. When cloud-init grows that support we will handle that accordingly.

=== modified file 'src/maasserver/compose_preseed.py'
--- src/maasserver/compose_preseed.py	2015-09-24 16:22:12 +0000
+++ src/maasserver/compose_preseed.py	2015-10-16 19:56:17 +0000
@@ -55,6 +55,10 @@
         "manage_etc_hosts": False,
         "apt_preserve_sources_list": True,
         "apt_proxy": get_apt_proxy_for_node(node),
+        # Prevent the node from requesting cloud-init data on every reboot.
+        # This is done so a machine does not need to contact MAAS every time
+        # it reboots.
+        "manual_cache_clean": True,
         # This is used as preseed for a node that's been installed.
         # This will allow cloud-init to be configured with reporting for
         # a node that has already been installed.

=== modified file 'src/maasserver/tests/test_compose_preseed.py'
--- src/maasserver/tests/test_compose_preseed.py	2015-09-24 16:22:12 +0000
+++ src/maasserver/tests/test_compose_preseed.py	2015-10-16 19:56:17 +0000
@@ -141,6 +141,7 @@
         self.assertIn("apt_preserve_sources_list", data)
         self.assertTrue(data["apt_preserve_sources_list"])
         self.assertEqual(apt_proxy, data["apt_proxy"])
+        self.assertTrue(data["manual_cache_clean"])
 
     def test_compose_preseed_with_curtin_installer(self):
         node = factory.make_Node(