Openstack Mojo Testing

Merge lp:~gnuoy/openstack-mojo-specs/cephha-spec-fixes into lp:openstack-mojo-specs

  1. cephha-spec-fixes
  2. Merge into mojo-openstack-specs
Proposed by Liam Young
Status: Merged
Approved by: Chris MacNaughton
Approved revision: 315
Merged at revision: 315
Proposed branch: lp:~gnuoy/openstack-mojo-specs/cephha-spec-fixes
Merge into: lp:openstack-mojo-specs
Diff against target: 116 lines (+19/-8)
8 files modified
helper/bundles/cephradosgw-ha.yaml (+12/-1)
specs/storage/ceph/radosgw_ha/icehouse/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/kilo/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/liberty/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/mitaka/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/newton/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/ocata/manifest (+1/-1)
specs/storage/ceph/radosgw_ha/pike/manifest (+1/-1)
To merge this branch: bzr merge lp:~gnuoy/openstack-mojo-specs/cephha-spec-fixes
Reviewer Review Type Date Requested Status
OpenStack Charm Testing Maintainers Pending
Review via email: mp+334196@code.launchpad.net
To post a comment you must log in.

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-09-11 15:47:30 +0000
3+++ helper/bundles/cephradosgw-ha.yaml 2017-11-23 15:33:14 +0000
4@@ -80,9 +80,20 @@
5 ha-bindiface: ens2
6 openstack-origin: cloud:xenial-ocata
7 source: cloud:xenial-ocata
8+xenial-pike:
9+ inherits: openstack-services
10+ series: xenial
11+ overrides:
12+ ha-bindiface: ens2
13+ openstack-origin: cloud:xenial-pike
14+ source: cloud:xenial-pike
15 zesty-ocata:
16 inherits: openstack-services
17 series: zesty
18 overrides:
19 ha-bindiface: ens2
20-
21+artful-pike:
22+ inherits: openstack-services
23+ series: artful
24+ overrides:
25+ ha-bindiface: ens2
26
27=== modified file 'specs/storage/ceph/radosgw_ha/icehouse/manifest'
28--- specs/storage/ceph/radosgw_ha/icehouse/manifest 2017-09-06 18:57:04 +0000
29+++ specs/storage/ceph/radosgw_ha/icehouse/manifest 2017-11-23 15:33:14 +0000
30@@ -14,7 +14,7 @@
31 verify config=test_obj_store.py
32
33 # Delete the unit which is currently the leader (according to corosync)
34-script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
35+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_.*_vip'
36
37 # Test obj store by sending and recieving files
38 verify config=test_obj_store.py
39
40=== modified file 'specs/storage/ceph/radosgw_ha/kilo/manifest'
41--- specs/storage/ceph/radosgw_ha/kilo/manifest 2017-09-06 18:57:04 +0000
42+++ specs/storage/ceph/radosgw_ha/kilo/manifest 2017-11-23 15:33:14 +0000
43@@ -14,7 +14,7 @@
44 verify config=test_obj_store.py
45
46 # Delete the unit which is currently the leader (according to corosync)
47-script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
48+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_.*_vip'
49
50 # Test obj store by sending and recieving files
51 verify config=test_obj_store.py
52
53=== modified file 'specs/storage/ceph/radosgw_ha/liberty/manifest'
54--- specs/storage/ceph/radosgw_ha/liberty/manifest 2017-09-06 18:57:04 +0000
55+++ specs/storage/ceph/radosgw_ha/liberty/manifest 2017-11-23 15:33:14 +0000
56@@ -14,7 +14,7 @@
57 verify config=test_obj_store.py
58
59 # Delete the unit which is currently the leader (according to corosync)
60-script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
61+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_.*_vip'
62
63 # Test obj store by sending and recieving files
64 verify config=test_obj_store.py
65
66=== modified file 'specs/storage/ceph/radosgw_ha/mitaka/manifest'
67--- specs/storage/ceph/radosgw_ha/mitaka/manifest 2017-09-06 18:57:04 +0000
68+++ specs/storage/ceph/radosgw_ha/mitaka/manifest 2017-11-23 15:33:14 +0000
69@@ -14,7 +14,7 @@
70 verify config=test_obj_store.py
71
72 # Delete the unit which is currently the leader (according to corosync)
73-script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
74+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_.*_vip'
75
76 # Test obj store by sending and recieving files
77 verify config=test_obj_store.py
78
79=== modified file 'specs/storage/ceph/radosgw_ha/newton/manifest'
80--- specs/storage/ceph/radosgw_ha/newton/manifest 2017-09-06 18:57:04 +0000
81+++ specs/storage/ceph/radosgw_ha/newton/manifest 2017-11-23 15:33:14 +0000
82@@ -14,7 +14,7 @@
83 verify config=test_obj_store.py
84
85 # Delete the unit which is currently the leader (according to corosync)
86-script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
87+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_.*_vip'
88
89 # Test obj store by sending and recieving files
90 verify config=test_obj_store.py
91
92=== modified file 'specs/storage/ceph/radosgw_ha/ocata/manifest'
93--- specs/storage/ceph/radosgw_ha/ocata/manifest 2017-09-06 18:57:04 +0000
94+++ specs/storage/ceph/radosgw_ha/ocata/manifest 2017-11-23 15:33:14 +0000
95@@ -14,7 +14,7 @@
96 verify config=test_obj_store.py
97
98 # Delete the unit which is currently the leader (according to corosync)
99-script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
100+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_.*_vip'
101
102 # Test obj store by sending and recieving files
103 verify config=test_obj_store.py
104
105=== modified file 'specs/storage/ceph/radosgw_ha/pike/manifest'
106--- specs/storage/ceph/radosgw_ha/pike/manifest 2017-09-06 18:57:04 +0000
107+++ specs/storage/ceph/radosgw_ha/pike/manifest 2017-11-23 15:33:14 +0000
108@@ -14,7 +14,7 @@
109 verify config=test_obj_store.py
110
111 # Delete the unit which is currently the leader (according to corosync)
112-script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_eth0_vip'
113+script config=delete_crm_leader.py SERVICE='ceph-radosgw' RESOURCE='res_cephrg_.*_vip'
114
115 # Test obj store by sending and recieving files
116 verify config=test_obj_store.py

Subscribers

People subscribed via source and target branches