Merge lp:~jtv/maas/bug-1305118 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

For the default simplestreams path, use the -v2 data, not the old data. Otherwise, the import script breaks with a KeyError on items['subarches'].

Discovered this because a new maas-test change tries to make use of the default. We didn't normally notice because both the maas source tree and the packages provide a bootresources.yaml with explicit path values.

Jeroen

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2014-04-07 09:12:10 +0000
+++ src/provisioningserver/config.py	2014-04-09 15:02:56 +0000
@@ -173,7 +173,7 @@
     if_key_missing = None
 
     path = String(
-        if_missing="http://maas.ubuntu.com/images/ephemeral/releases/")
+        if_missing="http://maas.ubuntu.com/images/ephemeral-v2/releases/")
     keyring = String(
         if_missing="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg")
     selections = ForEach(

=== modified file 'src/provisioningserver/tests/test_config.py'
--- src/provisioningserver/tests/test_config.py	2014-04-07 09:12:10 +0000
+++ src/provisioningserver/tests/test_config.py	2014-04-09 15:02:56 +0000
@@ -432,7 +432,8 @@
             'sources': [
                 {
                     'path': (
-                        'http://maas.ubuntu.com/images/ephemeral/releases/'),
+                        'http://maas.ubuntu.com/images/ephemeral-v2/releases/'
+                        ),
                     'keyring': (
                         '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),
                     'selections': [