Merge lp:~ltrager/maas/xenial_default into lp:~maas-committers/maas/trunk

[Lee Trager]

Set Xenial as the default image and commissioing release. Set images.maas.io as the default simplestream.

The default commissioning release and image to deploy are both set by looking at what UbuntuOS.lts() is set to. This is a child class of UbuntuDistroInfo, an external package. Because Xenial isn't released yet its still showing trusty. I modified UbuntuOS to return Xenial for now, once Xenial is released we can remove this work around. The default image was actually hard coded so I modified it to also get its data from UbuntuOS.

I also noticed that the default simplestream was still set to maas.ubuntu.com, which redirects to images.maas.io. I set the default stream to https://images.maas.io. As the docs are still on maas.ubuntu.com I left those URLs alone.

[Blake Rouse (blake-rouse)]

Looks good. Thanks for fixing the import url.

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~ltrager/maas/xenial_default into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [247 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main Sources [1,109 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main amd64 Packages [1,436 kB]
Fetched 2,792 kB in 0s (3,390 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash 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 postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-2ubuntu1).
archdetect-deb is already the newest version (1.117ubuntu1).
authbind is already the newest version (2.1.1+nmu1).
bash is already the newest version (4.3-14ubuntu1).
bind9 is already the newest version (1:9.10.3.dfsg.P4-5).
bind9utils is already the newest version (1:9.10.3.dfsg.P4-5).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
dh-apport is already the newest version (2.20.1-0ubuntu1).
dh-systemd is already the newest version (1.29ubuntu1).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.10.3.dfsg.P4-5).
firefox is already the newest version (45.0.1+build1-0ubuntu1).
freeipmi-tools is already the newest version (1.4.11-1ubuntu1).
git is already the newest version (1...

[Scott Moser (smoser)]

just an fyi, for anyone ever looking here, i opened bug at https://bugs.launchpad.net/maas/+bug/1582836 for the apparently unrelated change from http to https

=== modified file 'README'
--- README	2014-03-26 11:11:08 +0000
+++ README	2016-04-07 07:49:45 +0000
@@ -29,4 +29,4 @@
 
 For more information see the `MAAS guide`_.
 
-.. _MAAS guide: https://maas.ubuntu.com/
+.. _MAAS guide: https://maas.io/
 
=== modified file 'docs/_static/versions.js'
--- docs/_static/versions.js	2014-04-14 21:42:00 +0000
+++ docs/_static/versions.js	2016-04-07 07:49:45 +0000
@@ -2,7 +2,7 @@
 
 This is mostly done, but not limited to support creating links
 between the different versions of the MAAS documentation on
-maas.ubuntu.com.
+maas.io.
 
 */
 
 
=== modified file 'docs/about.rst'
--- docs/about.rst	2014-11-10 16:39:12 +0000
+++ docs/about.rst	2016-04-07 07:49:45 +0000
@@ -23,10 +23,10 @@
 However, it is also possible that there have been additional sections,
 or more helpful and clearer bits added since the package you are using
 was made. For this reason you can always find the latest documentation
-online here: `http://maas.ubuntu.com`_.
+online here: `http://maas.io/`_.
 
-.. _http://maas.ubuntu.com:
-  http://maas.ubuntu.com
+.. _http://maas.io/:
+  http://maas.io
 
 
 Contributing
 
=== modified file 'docs/bootsources.rst'
--- docs/bootsources.rst	2015-08-21 20:35:25 +0000
+++ docs/bootsources.rst	2016-04-07 07:49:45 +0000
@@ -20,7 +20,7 @@
     $ maas $PROFILE boot-sources read
     [
         {
-            "url": "http://maas.ubuntu.com/images/ephemeral-v2/releases/",
+            "url": "https://images.maas.io/ephemeral-v2/releases/",
             "keyring_data": "",
             "resource_uri": "<url omitted for readability>",
             "keyring_filename": "/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg",
 
=== modified file 'docs/index.rst'
--- docs/index.rst	2016-03-28 13:54:47 +0000
+++ docs/index.rst	2016-04-07 07:49:45 +0000
@@ -25,7 +25,7 @@
 compute nodes and redeploy it to Hadoop. When you're done, it's just
 as easy to give the node back to Nova.
 
-.. _MAAS project: http://maas.ubuntu.com
+.. _MAAS project: http://maas.io/
 .. _Juju: https://juju.ubuntu.com/
 
 MAAS is ideal where you want the flexibility of the cloud, and the
 
=== modified file 'docs/sstreams-mirror.rst'
--- docs/sstreams-mirror.rst	2015-12-04 19:33:29 +0000
+++ docs/sstreams-mirror.rst	2016-04-07 07:49:45 +0000
@@ -15,7 +15,7 @@
 This example gets the daily trusty (14.04) and precise (12.04) images for the
 amd64/generic and amd64/hwe-t architectures::
 
-  $ sudo sstream-mirror --keyring=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg http://maas.ubuntu.com/images/ephemeral-v2/daily/ /var/www/html/maas/images/ephemeral-v2/daily 'arch=amd64' 'subarch~(generic|hwe-t)' 'release~(trusty|precise)' --max=1
+  $ sudo sstream-mirror --keyring=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg https://images.maas.io/ephemeral-v2/daily/ /var/www/html/maas/images/ephemeral-v2/daily 'arch=amd64' 'subarch~(generic|hwe-t)' 'release~(trusty|precise)' --max=1
 
 This may take a while as hundreds of megabytes will be downloaded.
 
 
=== modified file 'src/maascli/parser.py'
--- src/maascli/parser.py	2015-12-15 22:44:22 +0000
+++ src/maascli/parser.py	2016-04-07 07:49:45 +0000
@@ -66,7 +66,7 @@
     help_title, help_body = parse_docstring(api)
     parser = ArgumentParser(
         description=help_body, prog=argv[0],
-        epilog="http://maas.ubuntu.com/")
+        epilog="http://maas.io/")
     register_cli_commands(parser)
     api.register_api_commands(parser)
     parser.add_argument(
 
=== modified file 'src/maasserver/bootresources.py'
--- src/maasserver/bootresources.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/bootresources.py	2016-04-07 07:49:45 +0000
@@ -459,7 +459,7 @@
         architecture = '%s/%s' % (arch, subarch)
 
         # Allow a generated resource to be replaced by a sycned resource. This
-        # gives the ability for maas.ubuntu.com to start providing images that
+        # gives the ability for maas.io to start providing images that
         # MAAS used to generate itself.
         supported_rtypes = [
             BOOT_RESOURCE_TYPE.SYNCED,
@@ -484,7 +484,7 @@
                 # replaced with this synced image.
                 resource.rtype = BOOT_RESOURCE_TYPE.SYNCED
 
-        # Simplestreams content from maas.ubuntu.com includes the following
+        # Simplestreams content from maas.io includes the following
         # extra fields. Looping through the extra product data and adding it to
         # extra will not work as the product data that is passed into this
         # object store contains additional data that should not be stored into
@@ -517,7 +517,7 @@
         """Get existing `BootResourceFile` for the given resource set and
         product or create a new one if one does not exist."""
         # For synced resources the filename is the same as the filetype. This
-        # is the way the data is from maas.ubuntu.com so we emulate that here.
+        # is the way the data is from maas.io so we emulate that here.
         filetype = product['ftype']
         filename = filetype
         rfile = get_one(resource_set.files.filter(filename=filename))
@@ -529,7 +529,7 @@
         rfile.filetype = filetype
         rfile.extra = {}
 
-        # Simplestreams content from maas.ubuntu.com includes the following
+        # Simplestreams content from maas.io includes the following
         # extra fields. Looping through the extra product data and adding it to
         # extra will not work as the product data that is passed into this
         # object store contains additional data that should not be stored into
 
=== modified file 'src/maasserver/bootsources.py'
--- src/maasserver/bootsources.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/bootsources.py	2016-04-07 07:49:45 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Boot Sources."""
@@ -26,6 +26,7 @@
 from maasserver.utils.orm import transactional
 from maasserver.utils.threads import deferToDatabase
 from provisioningserver.auth import get_maas_user_gpghome
+from provisioningserver.drivers.osystem.ubuntu import UbuntuOS
 from provisioningserver.import_images.download_descriptions import (
     download_all_image_descriptions,
 )
@@ -48,13 +49,15 @@
     """Set default boot source if none is currently defined."""
     if not BootSource.objects.exists():
         source = BootSource.objects.create(
-            url='http://maas.ubuntu.com/images/ephemeral-v2/releases/',
+            url='https://images.maas.io/ephemeral-v2/releases/',
             keyring_filename=(
                 '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'))
         # Default is to import newest Ubuntu LTS releases, for only amd64
         # release versions only.
+        ubuntu = UbuntuOS()
         BootSourceSelection.objects.create(
-            boot_source=source, os='ubuntu', release='trusty',
+            boot_source=source, os=ubuntu.name,
+            release=ubuntu.get_default_commissioning_release(),
             arches=['amd64'], subarches=['*'], labels=['release'])
 
 
 
=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2016-03-31 23:34:55 +0000
+++ src/maasserver/enum.py	2016-04-07 07:49:45 +0000
@@ -310,7 +310,7 @@
     ROOT_DD = 'root-dd'
 
     # Following are not allowed on user upload. Only used for syncing
-    # from another simplestreams source. (Most likely maas.ubuntu.com)
+    # from another simplestreams source. (Most likely maas.io)
 
     #: Root Image (gets converted to root-image root-tgz, on Cluster)
     ROOT_IMAGE = 'root-image.gz'
 
=== modified file 'src/maasserver/forms.py'
--- src/maasserver/forms.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/forms.py	2016-04-07 07:49:45 +0000
@@ -1348,7 +1348,7 @@
         label="Sync URL", required=True,
         help_text=(
             "URL to sync boot image from. E.g. "
-            "http://maas.ubuntu.com/images/ephemeral-v2/releases/"))
+            "https://images.maas.io/ephemeral-v2/releases/"))
 
     def __init__(self, *args, **kwargs):
         super(BootSourceSettingsForm, self).__init__(*args, **kwargs)
 
=== modified file 'src/maasserver/models/tests/test_bootresourceset.py'
--- src/maasserver/models/tests/test_bootresourceset.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/models/tests/test_bootresourceset.py	2016-04-07 07:49:45 +0000
@@ -24,7 +24,7 @@
         for filetype in filetypes:
             # We set the filename to the same value as filetype, as in most
             # cases this will always be true. The simplestreams content from
-            # maas.ubuntu.com, is formatted this way.
+            # maas.io, is formatted this way.
             factory.make_boot_resource_file_with_content(
                 resource_set, filename=filetype, filetype=filetype)
 
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/testing/factory.py	2016-04-07 07:49:45 +0000
@@ -1318,7 +1318,7 @@
         for filetype in filetypes:
             # We set the filename to the same value as filetype, as in most
             # cases this will always be true. The simplestreams content from
-            # maas.ubuntu.com, is formatted this way.
+            # maas.io, is formatted this way.
             self.make_boot_resource_file_with_content(
                 resource_set, filename=filetype, filetype=filetype)
         return resource
 
=== modified file 'src/maasserver/tests/test_bootresources.py'
--- src/maasserver/tests/test_bootresources.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/tests/test_bootresources.py	2016-04-07 07:49:45 +0000
@@ -479,7 +479,7 @@
             filetype = factory.pick_enum(BOOT_RESOURCE_FILE_TYPE)
             # We set the filename to the same value as filetype, as in most
             # cases this will always be true. The simplestreams content from
-            # maas.ubuntu.com, is formatted this way.
+            # maas.io, is formatted this way.
             filename = filetype
             size = randint(1024, 2048)
             content = factory.make_bytes(size=size)
 
=== modified file 'src/maasserver/tests/test_bootsources.py'
--- src/maasserver/tests/test_bootsources.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/tests/test_bootsources.py	2016-04-07 07:49:45 +0000
@@ -102,7 +102,7 @@
         self.assertAttributes(
             source,
             {
-                'url': 'http://maas.ubuntu.com/images/ephemeral-v2/releases/',
+                'url': 'https://images.maas.io/ephemeral-v2/releases/',
                 'keyring_filename': (
                     '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),
             })
@@ -111,11 +111,11 @@
             selection.release: selection
             for selection in selections
             }
-        self.assertItemsEqual(['trusty'], by_release.keys())
+        self.assertItemsEqual(['xenial'], by_release.keys())
         self.assertAttributes(
-            by_release['trusty'],
+            by_release['xenial'],
             {
-                'release': 'trusty',
+                'release': 'xenial',
                 'arches': ['amd64'],
                 'subarches': ['*'],
                 'labels': ['release'],
 
=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2016-03-28 13:54:47 +0000
+++ src/provisioningserver/config.py	2016-04-07 07:49:45 +0000
@@ -181,7 +181,7 @@
     if_key_missing = None
 
     url = UnicodeString(
-        if_missing="http://maas.ubuntu.com/images/ephemeral-v2/releases/")
+        if_missing="https://images.maas.io/ephemeral-v2/releases/")
     keyring = UnicodeString(
         if_missing="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg")
     keyring_data = UnicodeString(if_missing="")
 
=== modified file 'src/provisioningserver/drivers/osystem/tests/test_ubuntu.py'
--- src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2015-12-18 00:07:25 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_ubuntu.py	2016-04-07 07:49:45 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the UbuntuOS module."""
@@ -18,7 +18,12 @@
 class TestUbuntuOS(MAASTestCase):
 
     def get_lts_release(self):
-        return UbuntuDistroInfo().lts()
+        # XXX ltrager 2016-04-06 - python3-distro-info won't set the latest lts
+        # to Xenial until its been released. So we can start testing MAAS 2.0
+        # with Xenial by default override it here. Once Xenial is released this
+        # can be removed
+        # return UbuntuDistroInfo().lts()
+        return "xenial"
 
     def get_release_title(self, release):
         info = UbuntuDistroInfo()
 
=== modified file 'src/provisioningserver/drivers/osystem/ubuntu.py'
--- src/provisioningserver/drivers/osystem/ubuntu.py	2015-12-17 03:22:59 +0000
+++ src/provisioningserver/drivers/osystem/ubuntu.py	2016-04-07 07:49:45 +0000
@@ -1,4 +1,4 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Ubuntu Operating System."""
@@ -39,7 +39,15 @@
 
     def get_lts_release(self):
         """Return the latest Ubuntu LTS release."""
-        return self.ubuntu_distro_info.lts()
+        lts_release = self.ubuntu_distro_info.lts()
+        # XXX ltrager 2016-04-06 - python3-distro-info won't set the latest lts
+        # to Xenial until its been released. So we can start testing MAAS 2.0
+        # with Xenial by default override it here. Once Xenial is released this
+        # can be removed
+        if lts_release == "trusty":
+            return "xenial"
+        else:
+            return lts_release
 
     def get_default_release(self):
         """Gets the default release to use when a release is not
 
=== modified file 'src/provisioningserver/import_images/tests/test_download_resources.py'
--- src/provisioningserver/import_images/tests/test_download_resources.py	2016-03-28 13:54:47 +0000
+++ src/provisioningserver/import_images/tests/test_download_resources.py	2016-04-07 07:49:45 +0000
@@ -73,7 +73,7 @@
         snapshot_path = self.make_dir()
         cache_path = os.path.join(storage_path, 'cache')
         file_store = FileStore(cache_path)
-        source_url = "http://maas.ubuntu.com/images/ephemeral-v2/releases/"
+        source_url = "https://images.maas.io/ephemeral-v2/releases/"
 
         download_resources.download_boot_resources(
             source_url, file_store, snapshot_path, None, None)