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

Proposed by Jeroen T. Vermeulen on 2014-04-09
Status: Merged
Approved by: Jeroen T. Vermeulen on 2014-04-09
Approved revision: 2236
Merged at revision: 2236
Proposed branch: lp:~jtv/maas/1.5-bug-1305118
Merge into: lp:maas/1.5
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/1.5-bug-1305118
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve on 2014-04-09
Review via email: mp+214975@code.launchpad.net

Commit message

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

To post a comment you must log in.
Jeroen T. Vermeulen (jtv) wrote :

Straight backport. Self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/config.py'
2--- src/provisioningserver/config.py 2014-04-07 14:18:42 +0000
3+++ src/provisioningserver/config.py 2014-04-09 15:25:54 +0000
4@@ -173,7 +173,7 @@
5 if_key_missing = None
6
7 path = String(
8- if_missing="http://maas.ubuntu.com/images/ephemeral/releases/")
9+ if_missing="http://maas.ubuntu.com/images/ephemeral-v2/releases/")
10 keyring = String(
11 if_missing="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg")
12 selections = ForEach(
13
14=== modified file 'src/provisioningserver/tests/test_config.py'
15--- src/provisioningserver/tests/test_config.py 2014-04-07 14:18:42 +0000
16+++ src/provisioningserver/tests/test_config.py 2014-04-09 15:25:54 +0000
17@@ -432,7 +432,8 @@
18 'sources': [
19 {
20 'path': (
21- 'http://maas.ubuntu.com/images/ephemeral/releases/'),
22+ 'http://maas.ubuntu.com/images/ephemeral-v2/releases/'
23+ ),
24 'keyring': (
25 '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),
26 'selections': [

Subscribers

People subscribed via source and target branches

to all changes: