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

[Blake Rouse]

Add apt_mirror in the cloud-init preseed.

[Mike Pontillo (mpontillo)]

Looks good. This is difficult to unit test, and I understand this code has already been tested at a customer site, so I'm approving.

review: Approve

[MAAS Lander (maas-lander)]

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

Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:2 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:3 http://security.ubuntu.com trusty-security/main Sources [99.2 kB]
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [244 kB]
Get:5 http://security.ubuntu.com trusty-security/universe Sources [31.5 kB]
Get:6 http://security.ubuntu.com trusty-security/main amd64 Packages [370 kB]
Get:7 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [143 kB]
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [119 kB]
Get:9 http://security.ubuntu.com trusty-security/main Translation-en [200 kB]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [652 kB]
Get:11 http://security.ubuntu.com trusty-security/universe Translation-en [69.6 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [327 kB]
Get:13 http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en [319 kB]
Get:14 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [172 kB]
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,877 kB in 4s (638 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 py...

=== modified file 'src/maasserver/compose_preseed.py'
--- src/maasserver/compose_preseed.py	2015-10-30 18:12:45 +0000
+++ src/maasserver/compose_preseed.py	2015-11-12 19:17:29 +0000
@@ -43,6 +43,42 @@
         return None
 
 
+def get_system_info():
+    """Return the system info which includes the APT mirror information."""
+    return {
+        "system_info": {
+            "package_mirrors": [
+                {
+                    "arches": ["i386", "amd64"],
+                    "search": {
+                        "primary": [
+                            Config.objects.get_config("main_archive")],
+                        "security": [
+                            Config.objects.get_config("main_archive")],
+                    },
+                    "failsafe": {
+                        "primary": "http://archive.ubuntu.com/ubuntu",
+                        "security": "http://security.ubuntu.com/ubuntu",
+                    }
+                },
+                {
+                    "arches": ["default"],
+                    "search": {
+                        "primary": [
+                            Config.objects.get_config("ports_archive")],
+                        "security": [
+                            Config.objects.get_config("ports_archive")],
+                    },
+                    "failsafe": {
+                        "primary": "http://ports.ubuntu.com/ubuntu-ports",
+                        "security": "http://ports.ubuntu.com/ubuntu-ports",
+                    }
+                },
+            ]
+        }
+    }
+
+
 def compose_cloud_init_preseed(node, token, base_url=''):
     """Compose the preseed value for a node in any state but Commissioning."""
     credentials = urlencode({
@@ -75,8 +111,10 @@
                 'token_key': token.key,
                 'token_secret': token.secret,
             }
-        },
+        }
     }
+    # Add the system configuration information.
+    config.update(get_system_info())
     apt_proxy = get_apt_proxy_for_node(node)
     use_apt_proxy = (
         apt_proxy is not None and len(apt_proxy) > 0 and not
@@ -146,6 +184,8 @@
             },
         },
     }
+    # Add the system configuration information.
+    cloud_config.update(get_system_info())
     if apt_proxy:
         cloud_config['apt_proxy'] = apt_proxy
     return "#cloud-config\n%s" % yaml.safe_dump(cloud_config)

=== modified file 'src/maasserver/tests/test_compose_preseed.py'
--- src/maasserver/tests/test_compose_preseed.py	2015-10-30 16:03:19 +0000
+++ src/maasserver/tests/test_compose_preseed.py	2015-11-12 19:17:29 +0000
@@ -38,7 +38,11 @@
 )
 from provisioningserver.testing.os import make_osystem
 from testtools.matchers import (
+    ContainsDict,
+    Equals,
     KeysEqual,
+    MatchesDict,
+    MatchesListwise,
     StartsWith,
 )
 import yaml
@@ -46,6 +50,44 @@
 
 class TestComposePreseed(MAASServerTestCase):
 
+    def assertSystemInfo(self, config):
+        self.assertThat(config, ContainsDict({
+            'system_info': MatchesDict({
+                'package_mirrors': MatchesListwise([
+                    MatchesDict({
+                        "arches": Equals(["i386", "amd64"]),
+                        "search": MatchesDict({
+                            "primary": Equals(
+                                [Config.objects.get_config("main_archive")]),
+                            "security": Equals(
+                                [Config.objects.get_config("main_archive")]),
+                            }),
+                        "failsafe": MatchesDict({
+                            "primary": Equals(
+                                "http://archive.ubuntu.com/ubuntu"),
+                            "security": Equals(
+                                "http://security.ubuntu.com/ubuntu"),
+                            })
+                        }),
+                    MatchesDict({
+                        "arches": Equals(["default"]),
+                        "search": MatchesDict({
+                            "primary": Equals(
+                                [Config.objects.get_config("ports_archive")]),
+                            "security": Equals(
+                                [Config.objects.get_config("ports_archive")]),
+                            }),
+                        "failsafe": MatchesDict({
+                            "primary": Equals(
+                                "http://ports.ubuntu.com/ubuntu-ports"),
+                            "security": Equals(
+                                "http://ports.ubuntu.com/ubuntu-ports"),
+                            })
+                        }),
+                    ]),
+                }),
+            }))
+
     def test_compose_preseed_for_commissioning_node_skips_apt_proxy(self):
         node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
         Config.objects.set_config("enable_http_proxy", False)
@@ -70,6 +112,7 @@
             KeysEqual(
                 'consumer_key', 'endpoint', 'token_key', 'token_secret',
                 'type'))
+        self.assertSystemInfo(preseed)
 
     def test_compose_preseed_for_commissioning_node_has_header(self):
         node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
@@ -150,6 +193,7 @@
         self.assertTrue(data["apt_preserve_sources_list"])
         self.assertEqual(apt_proxy, data["apt_proxy"])
         self.assertTrue(data["manual_cache_clean"])
+        self.assertSystemInfo(data)
 
     def test_compose_preseed_skips_apt_proxy(self):
         node = factory.make_Node(status=NODE_STATUS.READY)
@@ -178,6 +222,7 @@
             absolute_reverse('curtin-metadata'),
             preseed['datasource']['MAAS']['metadata_url'])
         self.assertEqual(apt_proxy, preseed['apt_proxy'])
+        self.assertSystemInfo(preseed)
 
     def test_compose_preseed_with_curtin_installer_skips_apt_proxy(self):
         node = factory.make_Node(