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

Proposed by Jeroen T. Vermeulen on 2014-04-09
Status: Merged
Approved by: Jeroen T. Vermeulen on 2014-04-09
Approved revision: 2248
Merged at revision: 2248
Proposed branch: lp:~jtv/maas/bug-1305118
Merge into: lp:maas/trunk
Diff against target: 26 lines (+3/-2)
2 files modified
src/provisioningserver/config.py (+1/-1)
src/provisioningserver/tests/test_config.py (+2/-1)
To merge this branch: bzr merge lp:~jtv/maas/bug-1305118
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2014-04-09 Approve on 2014-04-09
Review via email: mp+214966@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Raphaël Badin (rvb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
173 if_key_missing = None173 if_key_missing = None
174174
175 path = String(175 path = String(
176 if_missing="http://maas.ubuntu.com/images/ephemeral/releases/")176 if_missing="http://maas.ubuntu.com/images/ephemeral-v2/releases/")
177 keyring = String(177 keyring = String(
178 if_missing="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg")178 if_missing="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg")
179 selections = ForEach(179 selections = ForEach(
180180
=== 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 @@
432 'sources': [432 'sources': [
433 {433 {
434 'path': (434 'path': (
435 'http://maas.ubuntu.com/images/ephemeral/releases/'),435 'http://maas.ubuntu.com/images/ephemeral-v2/releases/'
436 ),
436 'keyring': (437 'keyring': (
437 '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),438 '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),
438 'selections': [439 'selections': [