Openstack Mojo Testing

Merge lp:~xfactor973/openstack-mojo-specs/ceph-fixes into lp:openstack-mojo-specs

  1. ceph-fixes
  2. Merge into mojo-openstack-specs
Proposed by Chris Holcombe
Status: Merged
Merged at revision: 267
Proposed branch: lp:~xfactor973/openstack-mojo-specs/ceph-fixes
Merge into: lp:openstack-mojo-specs
Diff against target: 38 lines (+6/-6)
3 files modified
helper/bundles/ceph-default.yaml (+2/-2)
helper/bundles/ceph-encrypt.yaml (+2/-2)
helper/bundles/ceph-harden.yaml (+2/-2)
To merge this branch: bzr merge lp:~xfactor973/openstack-mojo-specs/ceph-fixes
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Review via email: mp+300495@code.launchpad.net

Description of the change

There was a copy error in the ceph yaml file that causes the mojo runs to fail. They should inherit from base and not openstack-icehouse.

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/ceph-default.yaml'
2--- helper/bundles/ceph-default.yaml 2016-05-20 13:43:52 +0000
3+++ helper/bundles/ceph-default.yaml 2016-07-19 16:15:40 +0000
4@@ -41,5 +41,5 @@
5 overrides:
6 source: cloud:trusty-mitaka
7 xenial-mitaka:
8- inherits: openstack-icehouse
9- series: xenial
10\ No newline at end of file
11+ inherits: base
12+ series: xenial
13
14=== modified file 'helper/bundles/ceph-encrypt.yaml'
15--- helper/bundles/ceph-encrypt.yaml 2016-05-20 13:43:52 +0000
16+++ helper/bundles/ceph-encrypt.yaml 2016-07-19 16:15:40 +0000
17@@ -42,5 +42,5 @@
18 overrides:
19 source: cloud:trusty-mitaka
20 xenial-mitaka:
21- inherits: openstack-icehouse
22- series: xenial
23\ No newline at end of file
24+ inherits: base
25+ series: xenial
26
27=== modified file 'helper/bundles/ceph-harden.yaml'
28--- helper/bundles/ceph-harden.yaml 2016-05-20 14:41:37 +0000
29+++ helper/bundles/ceph-harden.yaml 2016-07-19 16:15:40 +0000
30@@ -44,5 +44,5 @@
31 overrides:
32 source: cloud:trusty-mitaka
33 xenial-mitaka:
34- inherits: openstack-icehouse
35- series: xenial
36\ No newline at end of file
37+ inherits: base
38+ series: xenial

Subscribers

People subscribed via source and target branches