Merge lp:~chris.macnaughton/openstack-mojo-specs/ceph-ha into lp:openstack-mojo-specs

Proposed by Chris MacNaughton on 2017-02-22
Status: Merged
Merged at revision: 303
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/ceph-ha
Merge into: lp:openstack-mojo-specs
Diff against target: 70 lines (+34/-1)
3 files modified
helper/bundles/cephradosgw-ha.yaml (+6/-1)
helper/bundles/swift-ha-proxy-phase1.yaml (+14/-0)
helper/bundles/swift-ha-proxy-phase2.yaml (+14/-0)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/ceph-ha
Reviewer Review Type Date Requested Status
David Ames 2017-02-22 Approve on 2017-02-28
Review via email: mp+317998@code.launchpad.net
To post a comment you must log in.
302. By Chris MacNaughton on 2017-02-22

add trusty-mitaka

303. By Chris MacNaughton on 2017-02-23

update specs

304. By Chris MacNaughton on 2017-02-23

add xenial-ocata

David Ames (thedac) wrote :

Looks good. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/cephradosgw-ha.yaml'
2--- helper/bundles/cephradosgw-ha.yaml 2017-02-13 21:32:06 +0000
3+++ helper/bundles/cephradosgw-ha.yaml 2017-02-23 21:56:03 +0000
4@@ -28,7 +28,6 @@
5 num_units: 3
6 options:
7 vip: 10.5.100.10
8- use-embedded-webserver: False
9 cephrgw-hacluster:
10 charm: hacluster
11 relations:
12@@ -51,6 +50,12 @@
13 overrides:
14 openstack-origin: cloud:trusty-liberty
15 source: cloud:trusty-liberty
16+trusty-mitaka:
17+ inherits: openstack-services
18+ series: trusty
19+ overrides:
20+ openstack-origin: cloud:trusty-mitaka
21+ source: cloud:trusty-mitaka
22 xenial-mitaka:
23 inherits: openstack-services
24 series: xenial
25
26=== modified file 'helper/bundles/swift-ha-proxy-phase1.yaml'
27--- helper/bundles/swift-ha-proxy-phase1.yaml 2016-10-13 15:30:54 +0000
28+++ helper/bundles/swift-ha-proxy-phase1.yaml 2017-02-23 21:56:03 +0000
29@@ -87,3 +87,17 @@
30 series: xenial
31 overrides:
32 ha-bindiface: ens2
33+xenial-newton:
34+ inherits: openstack-services
35+ series: xenial
36+ overrides:
37+ openstack-origin: cloud:xenial-newton
38+ source: cloud:xenial-newton
39+ ha-bindiface: ens2
40+xenial-ocata:
41+ inherits: openstack-services
42+ series: xenial
43+ overrides:
44+ ha-bindiface: ens2
45+ openstack-origin: cloud:xenial-ocata
46+ source: cloud:xenial-ocata
47\ No newline at end of file
48
49=== modified file 'helper/bundles/swift-ha-proxy-phase2.yaml'
50--- helper/bundles/swift-ha-proxy-phase2.yaml 2016-10-13 15:30:54 +0000
51+++ helper/bundles/swift-ha-proxy-phase2.yaml 2017-02-23 21:56:03 +0000
52@@ -51,3 +51,17 @@
53 series: xenial
54 overrides:
55 ha-bindiface: ens2
56+xenial-newton:
57+ inherits: openstack-services
58+ series: xenial
59+ overrides:
60+ openstack-origin: cloud:xenial-newton
61+ source: cloud:xenial-newton
62+ ha-bindiface: ens2
63+xenial-ocata:
64+ inherits: openstack-services
65+ series: xenial
66+ overrides:
67+ ha-bindiface: ens2
68+ openstack-origin: cloud:xenial-ocata
69+ source: cloud:xenial-ocata
70\ No newline at end of file

Subscribers

People subscribed via source and target branches