Merge lp:~thedac/openstack-mojo-specs/ha-automation into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709
- ha-automation
- Merge into mojo-openstack-specs-1709
Status: | Merged |
---|---|
Merged at revision: | 334 |
Proposed branch: | lp:~thedac/openstack-mojo-specs/ha-automation |
Merge into: | lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709 |
Diff against target: |
676 lines (+121/-56) 16 files modified
helper/bundles/cephradosgw-ha.yaml (+1/-1) helper/bundles/ha-next.yaml (+9/-9) helper/bundles/ha.yaml (+9/-9) helper/bundles/haphase1-next.yaml (+9/-9) helper/bundles/haphase1.yaml (+9/-9) helper/bundles/haphase2-next.yaml (+9/-9) helper/bundles/haphase2.yaml (+9/-9) helper/bundles/swift-ha-proxy-phase1.yaml (+1/-1) helper/setup/preflight.py (+44/-0) specs/full_stack/next_ha_oneshot/icehouse/manifest (+3/-0) specs/full_stack/next_ha_oneshot/kilo/manifest (+3/-0) specs/full_stack/next_ha_oneshot/liberty/manifest (+3/-0) specs/full_stack/next_ha_oneshot/mitaka/manifest (+3/-0) specs/full_stack/next_ha_oneshot/newton/manifest (+3/-0) specs/full_stack/next_ha_oneshot/ocata/manifest (+3/-0) specs/full_stack/next_ha_oneshot/pike/manifest (+3/-0) |
To merge this branch: | bzr merge lp:~thedac/openstack-mojo-specs/ha-automation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Approve | ||
Review via email: mp+330464@code.launchpad.net |
Commit message
Description of the change
HA in OSCI
Ryan Beisner (1chb1n) wrote : | # |
Bah. Awesome except the `make lint` failures. I believe the {{ foo }} needs to be in quotes.
Traceback (most recent call last):
File "./helper/
sys.
File "./helper/
check_
File "./helper/
yaml.
File "/home/
return loader.
File "/home/
return self.construct_
File "/home/
for dummy in generator:
File "/home/
value = self.construct_
File "/home/
return BaseConstructor
File "/home/
"found unacceptable key (%s)" % exc, key_node.
yaml.constructo
in "haphase2.yaml", line 29, column 14
found unacceptable key (unhashable type: 'dict')
in "haphase2.yaml", line 29, column 15
- 335. By David Ames
-
Quote template variables
Preview Diff
1 | === modified file 'helper/bundles/cephradosgw-ha.yaml' | |||
2 | --- helper/bundles/cephradosgw-ha.yaml 2017-02-22 16:33:11 +0000 | |||
3 | +++ helper/bundles/cephradosgw-ha.yaml 2017-09-11 15:47:43 +0000 | |||
4 | @@ -27,7 +27,7 @@ | |||
5 | 27 | charm: ceph-radosgw | 27 | charm: ceph-radosgw |
6 | 28 | num_units: 3 | 28 | num_units: 3 |
7 | 29 | options: | 29 | options: |
9 | 30 | vip: 10.5.100.10 | 30 | vip: "{{ MOJO_OS_VIP01 }}" |
10 | 31 | cephrgw-hacluster: | 31 | cephrgw-hacluster: |
11 | 32 | charm: hacluster | 32 | charm: hacluster |
12 | 33 | relations: | 33 | relations: |
13 | 34 | 34 | ||
14 | === modified file 'helper/bundles/ha-next.yaml' | |||
15 | --- helper/bundles/ha-next.yaml 2017-09-05 21:37:34 +0000 | |||
16 | +++ helper/bundles/ha-next.yaml 2017-09-11 15:47:43 +0000 | |||
17 | @@ -9,7 +9,7 @@ | |||
18 | 9 | innodb-buffer-pool-size: 200M | 9 | innodb-buffer-pool-size: 200M |
19 | 10 | sst-password: changeme | 10 | sst-password: changeme |
20 | 11 | root-password: changeme | 11 | root-password: changeme |
22 | 12 | vip: 10.5.100.1 | 12 | vip: "{{ MOJO_OS_VIP01 }}" |
23 | 13 | mysql-hacluster: | 13 | mysql-hacluster: |
24 | 14 | charm: hacluster | 14 | charm: hacluster |
25 | 15 | options: | 15 | options: |
26 | @@ -37,7 +37,7 @@ | |||
27 | 37 | options: | 37 | options: |
28 | 38 | admin-password: openstack | 38 | admin-password: openstack |
29 | 39 | admin-token: ubuntutesting | 39 | admin-token: ubuntutesting |
31 | 40 | vip: 10.5.100.2 | 40 | vip: "{{ MOJO_OS_VIP02 }}" |
32 | 41 | keystone-hacluster: | 41 | keystone-hacluster: |
33 | 42 | charm: hacluster | 42 | charm: hacluster |
34 | 43 | options: | 43 | options: |
35 | @@ -48,7 +48,7 @@ | |||
36 | 48 | constraints: mem=1G | 48 | constraints: mem=1G |
37 | 49 | num_units: 3 | 49 | num_units: 3 |
38 | 50 | options: | 50 | options: |
40 | 51 | vip: 10.5.100.3 | 51 | vip: "{{ MOJO_OS_VIP03 }}" |
41 | 52 | dashboard-hacluster: | 52 | dashboard-hacluster: |
42 | 53 | charm: hacluster | 53 | charm: hacluster |
43 | 54 | options: | 54 | options: |
44 | @@ -67,7 +67,7 @@ | |||
45 | 67 | num_units: 3 | 67 | num_units: 3 |
46 | 68 | options: | 68 | options: |
47 | 69 | network-manager: Neutron | 69 | network-manager: Neutron |
49 | 70 | vip: 10.5.100.4 | 70 | vip: "{{ MOJO_OS_VIP04 }}" |
50 | 71 | nova-cc-hacluster: | 71 | nova-cc-hacluster: |
51 | 72 | charm: hacluster | 72 | charm: hacluster |
52 | 73 | options: | 73 | options: |
53 | @@ -86,7 +86,7 @@ | |||
54 | 86 | options: | 86 | options: |
55 | 87 | block-device: "None" | 87 | block-device: "None" |
56 | 88 | glance-api-version: 2 | 88 | glance-api-version: 2 |
58 | 89 | vip: 10.5.100.5 | 89 | vip: "{{ MOJO_OS_VIP05 }}" |
59 | 90 | cinder-hacluster: | 90 | cinder-hacluster: |
60 | 91 | charm: hacluster | 91 | charm: hacluster |
61 | 92 | options: | 92 | options: |
62 | @@ -99,7 +99,7 @@ | |||
63 | 99 | constraints: mem=1G | 99 | constraints: mem=1G |
64 | 100 | num_units: 3 | 100 | num_units: 3 |
65 | 101 | options: | 101 | options: |
67 | 102 | vip: 10.5.100.9 | 102 | vip: "{{ MOJO_OS_VIP06 }}" |
68 | 103 | glance-hacluster: | 103 | glance-hacluster: |
69 | 104 | charm: hacluster | 104 | charm: hacluster |
70 | 105 | options: | 105 | options: |
71 | @@ -113,7 +113,7 @@ | |||
72 | 113 | zone-assignment: manual | 113 | zone-assignment: manual |
73 | 114 | replicas: 3 | 114 | replicas: 3 |
74 | 115 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae | 115 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
76 | 116 | vip: 10.5.100.6 | 116 | vip: "{{ MOJO_OS_VIP07 }}" |
77 | 117 | swift-hacluster: | 117 | swift-hacluster: |
78 | 118 | charm: hacluster | 118 | charm: hacluster |
79 | 119 | options: | 119 | options: |
80 | @@ -145,7 +145,7 @@ | |||
81 | 145 | constraints: mem=1G | 145 | constraints: mem=1G |
82 | 146 | num_units: 3 | 146 | num_units: 3 |
83 | 147 | options: | 147 | options: |
85 | 148 | vip: 10.5.100.7 | 148 | vip: "{{ MOJO_OS_VIP08 }}" |
86 | 149 | ceilometer-hacluster: | 149 | ceilometer-hacluster: |
87 | 150 | charm: hacluster | 150 | charm: hacluster |
88 | 151 | options: | 151 | options: |
89 | @@ -164,7 +164,7 @@ | |||
90 | 164 | num_units: 3 | 164 | num_units: 3 |
91 | 165 | options: | 165 | options: |
92 | 166 | neutron-security-groups: True | 166 | neutron-security-groups: True |
94 | 167 | vip: 10.5.100.8 | 167 | vip: "{{ MOJO_OS_VIP09 }}" |
95 | 168 | flat-network-providers: physnet1 | 168 | flat-network-providers: physnet1 |
96 | 169 | neutron-hacluster: | 169 | neutron-hacluster: |
97 | 170 | charm: hacluster | 170 | charm: hacluster |
98 | 171 | 171 | ||
99 | === modified file 'helper/bundles/ha.yaml' | |||
100 | --- helper/bundles/ha.yaml 2017-09-06 21:02:15 +0000 | |||
101 | +++ helper/bundles/ha.yaml 2017-09-11 15:47:43 +0000 | |||
102 | @@ -12,7 +12,7 @@ | |||
103 | 12 | innodb-buffer-pool-size: 200M | 12 | innodb-buffer-pool-size: 200M |
104 | 13 | sst-password: changeme | 13 | sst-password: changeme |
105 | 14 | root-password: changeme | 14 | root-password: changeme |
107 | 15 | vip: 10.5.100.1 | 15 | vip: "{{ MOJO_OS_VIP01 }}" |
108 | 16 | mysql-hacluster: | 16 | mysql-hacluster: |
109 | 17 | charm: hacluster | 17 | charm: hacluster |
110 | 18 | options: | 18 | options: |
111 | @@ -40,7 +40,7 @@ | |||
112 | 40 | options: | 40 | options: |
113 | 41 | admin-password: openstack | 41 | admin-password: openstack |
114 | 42 | admin-token: ubuntutesting | 42 | admin-token: ubuntutesting |
116 | 43 | vip: 10.5.100.2 | 43 | vip: "{{ MOJO_OS_VIP02 }}" |
117 | 44 | keystone-hacluster: | 44 | keystone-hacluster: |
118 | 45 | charm: hacluster | 45 | charm: hacluster |
119 | 46 | options: | 46 | options: |
120 | @@ -51,7 +51,7 @@ | |||
121 | 51 | constraints: mem=1G | 51 | constraints: mem=1G |
122 | 52 | num_units: 3 | 52 | num_units: 3 |
123 | 53 | options: | 53 | options: |
125 | 54 | vip: 10.5.100.3 | 54 | vip: "{{ MOJO_OS_VIP03 }}" |
126 | 55 | dashboard-hacluster: | 55 | dashboard-hacluster: |
127 | 56 | charm: hacluster | 56 | charm: hacluster |
128 | 57 | options: | 57 | options: |
129 | @@ -70,7 +70,7 @@ | |||
130 | 70 | num_units: 3 | 70 | num_units: 3 |
131 | 71 | options: | 71 | options: |
132 | 72 | network-manager: Neutron | 72 | network-manager: Neutron |
134 | 73 | vip: 10.5.100.4 | 73 | vip: "{{ MOJO_OS_VIP04 }}" |
135 | 74 | nova-cc-hacluster: | 74 | nova-cc-hacluster: |
136 | 75 | charm: hacluster | 75 | charm: hacluster |
137 | 76 | options: | 76 | options: |
138 | @@ -89,7 +89,7 @@ | |||
139 | 89 | options: | 89 | options: |
140 | 90 | block-device: "None" | 90 | block-device: "None" |
141 | 91 | glance-api-version: 2 | 91 | glance-api-version: 2 |
143 | 92 | vip: 10.5.100.5 | 92 | vip: "{{ MOJO_OS_VIP05 }}" |
144 | 93 | cinder-hacluster: | 93 | cinder-hacluster: |
145 | 94 | charm: hacluster | 94 | charm: hacluster |
146 | 95 | options: | 95 | options: |
147 | @@ -102,7 +102,7 @@ | |||
148 | 102 | constraints: mem=1G | 102 | constraints: mem=1G |
149 | 103 | num_units: 3 | 103 | num_units: 3 |
150 | 104 | options: | 104 | options: |
152 | 105 | vip: 10.5.100.9 | 105 | vip: "{{ MOJO_OS_VIP06 }}" |
153 | 106 | glance-hacluster: | 106 | glance-hacluster: |
154 | 107 | charm: hacluster | 107 | charm: hacluster |
155 | 108 | options: | 108 | options: |
156 | @@ -116,7 +116,7 @@ | |||
157 | 116 | zone-assignment: manual | 116 | zone-assignment: manual |
158 | 117 | replicas: 3 | 117 | replicas: 3 |
159 | 118 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae | 118 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
161 | 119 | vip: 10.5.100.6 | 119 | vip: "{{ MOJO_OS_VIP07 }}" |
162 | 120 | swift-hacluster: | 120 | swift-hacluster: |
163 | 121 | charm: hacluster | 121 | charm: hacluster |
164 | 122 | options: | 122 | options: |
165 | @@ -148,7 +148,7 @@ | |||
166 | 148 | constraints: mem=1G | 148 | constraints: mem=1G |
167 | 149 | num_units: 3 | 149 | num_units: 3 |
168 | 150 | options: | 150 | options: |
170 | 151 | vip: 10.5.100.7 | 151 | vip: "{{ MOJO_OS_VIP08 }}" |
171 | 152 | ceilometer-hacluster: | 152 | ceilometer-hacluster: |
172 | 153 | charm: hacluster | 153 | charm: hacluster |
173 | 154 | options: | 154 | options: |
174 | @@ -167,7 +167,7 @@ | |||
175 | 167 | num_units: 3 | 167 | num_units: 3 |
176 | 168 | options: | 168 | options: |
177 | 169 | neutron-security-groups: True | 169 | neutron-security-groups: True |
179 | 170 | vip: 10.5.100.8 | 170 | vip: "{{ MOJO_OS_VIP09 }}" |
180 | 171 | flat-network-providers: physnet1 | 171 | flat-network-providers: physnet1 |
181 | 172 | neutron-hacluster: | 172 | neutron-hacluster: |
182 | 173 | charm: hacluster | 173 | charm: hacluster |
183 | 174 | 174 | ||
184 | === modified file 'helper/bundles/haphase1-next.yaml' | |||
185 | --- helper/bundles/haphase1-next.yaml 2017-09-05 21:37:34 +0000 | |||
186 | +++ helper/bundles/haphase1-next.yaml 2017-09-11 15:47:43 +0000 | |||
187 | @@ -26,7 +26,7 @@ | |||
188 | 26 | options: | 26 | options: |
189 | 27 | admin-password: openstack | 27 | admin-password: openstack |
190 | 28 | admin-token: ubuntutesting | 28 | admin-token: ubuntutesting |
192 | 29 | vip: 10.5.100.1 | 29 | vip: "{{ MOJO_OS_VIP01 }}" |
193 | 30 | keystone-hacluster: | 30 | keystone-hacluster: |
194 | 31 | charm: hacluster | 31 | charm: hacluster |
195 | 32 | openstack-dashboard: | 32 | openstack-dashboard: |
196 | @@ -34,7 +34,7 @@ | |||
197 | 34 | constraints: mem=1G | 34 | constraints: mem=1G |
198 | 35 | num_units: 2 | 35 | num_units: 2 |
199 | 36 | options: | 36 | options: |
201 | 37 | vip: 10.5.100.2 | 37 | vip: "{{ MOJO_OS_VIP02 }}" |
202 | 38 | dashboard-hacluster: | 38 | dashboard-hacluster: |
203 | 39 | charm: hacluster | 39 | charm: hacluster |
204 | 40 | nova-compute: | 40 | nova-compute: |
205 | @@ -51,7 +51,7 @@ | |||
206 | 51 | num_units: 2 | 51 | num_units: 2 |
207 | 52 | options: | 52 | options: |
208 | 53 | network-manager: Neutron | 53 | network-manager: Neutron |
210 | 54 | vip: 10.5.100.3 | 54 | vip: "{{ MOJO_OS_VIP02 }}" |
211 | 55 | ncc-hacluster: | 55 | ncc-hacluster: |
212 | 56 | charm: hacluster | 56 | charm: hacluster |
213 | 57 | neutron-gateway: | 57 | neutron-gateway: |
214 | @@ -67,7 +67,7 @@ | |||
215 | 67 | options: | 67 | options: |
216 | 68 | block-device: "None" | 68 | block-device: "None" |
217 | 69 | glance-api-version: 2 | 69 | glance-api-version: 2 |
219 | 70 | vip: 10.5.100.4 | 70 | vip: "{{ MOJO_OS_VIP03 }}" |
220 | 71 | constraints": mem=1G | 71 | constraints": mem=1G |
221 | 72 | cinder-hacluster: | 72 | cinder-hacluster: |
222 | 73 | charm: hacluster | 73 | charm: hacluster |
223 | @@ -78,7 +78,7 @@ | |||
224 | 78 | constraints: mem=1G | 78 | constraints: mem=1G |
225 | 79 | num_units: 2 | 79 | num_units: 2 |
226 | 80 | options: | 80 | options: |
228 | 81 | vip: 10.5.100.5 | 81 | vip: "{{ MOJO_OS_VIP04 }}" |
229 | 82 | glance-hacluster: | 82 | glance-hacluster: |
230 | 83 | charm: hacluster | 83 | charm: hacluster |
231 | 84 | swift-proxy: | 84 | swift-proxy: |
232 | @@ -89,7 +89,7 @@ | |||
233 | 89 | zone-assignment: manual | 89 | zone-assignment: manual |
234 | 90 | replicas: 3 | 90 | replicas: 3 |
235 | 91 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae | 91 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
237 | 92 | vip: 10.5.100.6 | 92 | vip: "{{ MOJO_OS_VIP05 }}" |
238 | 93 | swift-proxy-hacluster: | 93 | swift-proxy-hacluster: |
239 | 94 | charm: hacluster | 94 | charm: hacluster |
240 | 95 | swift-storage-z1: | 95 | swift-storage-z1: |
241 | @@ -121,7 +121,7 @@ | |||
242 | 121 | constraints: mem=1G | 121 | constraints: mem=1G |
243 | 122 | num_units: 2 | 122 | num_units: 2 |
244 | 123 | options: | 123 | options: |
246 | 124 | vip: 10.5.100.10 | 124 | vip: "{{ MOJO_OS_VIP06 }}" |
247 | 125 | vip_cidr: 16 | 125 | vip_cidr: 16 |
248 | 126 | openstack-percona-database: | 126 | openstack-percona-database: |
249 | 127 | inherits: openstack-services | 127 | inherits: openstack-services |
250 | @@ -131,7 +131,7 @@ | |||
251 | 131 | constraints: mem=1G | 131 | constraints: mem=1G |
252 | 132 | num_units: 2 | 132 | num_units: 2 |
253 | 133 | options: | 133 | options: |
255 | 134 | vip: 10.5.100.10 | 134 | vip: "{{ MOJO_OS_VIP07 }}" |
256 | 135 | vip_cidr: 16 | 135 | vip_cidr: 16 |
257 | 136 | root-password: crapper | 136 | root-password: crapper |
258 | 137 | sst-password: crapper | 137 | sst-password: crapper |
259 | @@ -144,7 +144,7 @@ | |||
260 | 144 | constraints: mem=1G | 144 | constraints: mem=1G |
261 | 145 | options: | 145 | options: |
262 | 146 | neutron-security-groups: True | 146 | neutron-security-groups: True |
264 | 147 | vip: 10.5.108.1 | 147 | vip: "{{ MOJO_OS_VIP08 }}" |
265 | 148 | flat-network-providers: physnet1 | 148 | flat-network-providers: physnet1 |
266 | 149 | neutron-api-hacluster: | 149 | neutron-api-hacluster: |
267 | 150 | charm: hacluster | 150 | charm: hacluster |
268 | 151 | 151 | ||
269 | === modified file 'helper/bundles/haphase1.yaml' | |||
270 | --- helper/bundles/haphase1.yaml 2017-09-05 21:37:34 +0000 | |||
271 | +++ helper/bundles/haphase1.yaml 2017-09-11 15:47:43 +0000 | |||
272 | @@ -29,7 +29,7 @@ | |||
273 | 29 | options: | 29 | options: |
274 | 30 | admin-password: openstack | 30 | admin-password: openstack |
275 | 31 | admin-token: ubuntutesting | 31 | admin-token: ubuntutesting |
277 | 32 | vip: 10.5.100.1 | 32 | vip: "{{ MOJO_OS_VIP01 }}" |
278 | 33 | keystone-hacluster: | 33 | keystone-hacluster: |
279 | 34 | charm: hacluster | 34 | charm: hacluster |
280 | 35 | openstack-dashboard: | 35 | openstack-dashboard: |
281 | @@ -37,7 +37,7 @@ | |||
282 | 37 | constraints: mem=1G | 37 | constraints: mem=1G |
283 | 38 | num_units: 2 | 38 | num_units: 2 |
284 | 39 | options: | 39 | options: |
286 | 40 | vip: 10.5.100.2 | 40 | vip: "{{ MOJO_OS_VIP02 }}" |
287 | 41 | dashboard-hacluster: | 41 | dashboard-hacluster: |
288 | 42 | charm: hacluster | 42 | charm: hacluster |
289 | 43 | nova-compute: | 43 | nova-compute: |
290 | @@ -55,7 +55,7 @@ | |||
291 | 55 | options: | 55 | options: |
292 | 56 | network-manager: Neutron | 56 | network-manager: Neutron |
293 | 57 | quantum-security-groups: "yes" | 57 | quantum-security-groups: "yes" |
295 | 58 | vip: 10.5.100.3 | 58 | vip: "{{ MOJO_OS_VIP03 }}" |
296 | 59 | ncc-hacluster: | 59 | ncc-hacluster: |
297 | 60 | charm: hacluster | 60 | charm: hacluster |
298 | 61 | neutron-gateway: | 61 | neutron-gateway: |
299 | @@ -70,7 +70,7 @@ | |||
300 | 70 | options: | 70 | options: |
301 | 71 | block-device: "None" | 71 | block-device: "None" |
302 | 72 | glance-api-version: 2 | 72 | glance-api-version: 2 |
304 | 73 | vip: 10.5.100.4 | 73 | vip: "{{ MOJO_OS_VIP04 }}" |
305 | 74 | constraints": mem=1G | 74 | constraints": mem=1G |
306 | 75 | cinder-hacluster: | 75 | cinder-hacluster: |
307 | 76 | charm: hacluster | 76 | charm: hacluster |
308 | @@ -81,7 +81,7 @@ | |||
309 | 81 | constraints: mem=1G | 81 | constraints: mem=1G |
310 | 82 | num_units: 2 | 82 | num_units: 2 |
311 | 83 | options: | 83 | options: |
313 | 84 | vip: 10.5.100.5 | 84 | vip: "{{ MOJO_OS_VIP05 }}" |
314 | 85 | glance-hacluster: | 85 | glance-hacluster: |
315 | 86 | charm: hacluster | 86 | charm: hacluster |
316 | 87 | swift-proxy: | 87 | swift-proxy: |
317 | @@ -92,7 +92,7 @@ | |||
318 | 92 | zone-assignment: manual | 92 | zone-assignment: manual |
319 | 93 | replicas: 3 | 93 | replicas: 3 |
320 | 94 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae | 94 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
322 | 95 | vip: 10.5.100.6 | 95 | vip: "{{ MOJO_OS_VIP06 }}" |
323 | 96 | swift-proxy-hacluster: | 96 | swift-proxy-hacluster: |
324 | 97 | charm: hacluster | 97 | charm: hacluster |
325 | 98 | swift-storage-z1: | 98 | swift-storage-z1: |
326 | @@ -124,7 +124,7 @@ | |||
327 | 124 | constraints: mem=1G | 124 | constraints: mem=1G |
328 | 125 | num_units: 2 | 125 | num_units: 2 |
329 | 126 | options: | 126 | options: |
331 | 127 | vip: 10.5.100.10 | 127 | vip: "{{ MOJO_OS_VIP07 }}" |
332 | 128 | vip_cidr: 16 | 128 | vip_cidr: 16 |
333 | 129 | openstack-percona-database: | 129 | openstack-percona-database: |
334 | 130 | inherits: openstack-services | 130 | inherits: openstack-services |
335 | @@ -134,7 +134,7 @@ | |||
336 | 134 | constraints: mem=1G | 134 | constraints: mem=1G |
337 | 135 | num_units: 2 | 135 | num_units: 2 |
338 | 136 | options: | 136 | options: |
340 | 137 | vip: 10.5.100.10 | 137 | vip: "{{ MOJO_OS_VIP08 }}" |
341 | 138 | vip_cidr: 16 | 138 | vip_cidr: 16 |
342 | 139 | root-password: crapper | 139 | root-password: crapper |
343 | 140 | sst-password: crapper | 140 | sst-password: crapper |
344 | @@ -147,7 +147,7 @@ | |||
345 | 147 | constraints: mem=1G | 147 | constraints: mem=1G |
346 | 148 | options: | 148 | options: |
347 | 149 | neutron-security-groups: True | 149 | neutron-security-groups: True |
349 | 150 | vip: 10.5.108.1 | 150 | vip: "{{ MOJO_OS_VIP09 }}" |
350 | 151 | neutron-api-hacluster: | 151 | neutron-api-hacluster: |
351 | 152 | charm: hacluster | 152 | charm: hacluster |
352 | 153 | options: | 153 | options: |
353 | 154 | 154 | ||
354 | === modified file 'helper/bundles/haphase2-next.yaml' | |||
355 | --- helper/bundles/haphase2-next.yaml 2017-09-05 21:37:34 +0000 | |||
356 | +++ helper/bundles/haphase2-next.yaml 2017-09-11 15:47:43 +0000 | |||
357 | @@ -26,7 +26,7 @@ | |||
358 | 26 | options: | 26 | options: |
359 | 27 | admin-password: openstack | 27 | admin-password: openstack |
360 | 28 | admin-token: ubuntutesting | 28 | admin-token: ubuntutesting |
362 | 29 | vip: 10.5.100.1 | 29 | vip: "{{ MOJO_OS_VIP01 }}" |
363 | 30 | keystone-hacluster: | 30 | keystone-hacluster: |
364 | 31 | charm: hacluster | 31 | charm: hacluster |
365 | 32 | openstack-dashboard: | 32 | openstack-dashboard: |
366 | @@ -34,7 +34,7 @@ | |||
367 | 34 | constraints: mem=1G | 34 | constraints: mem=1G |
368 | 35 | num_units: 2 | 35 | num_units: 2 |
369 | 36 | options: | 36 | options: |
371 | 37 | vip: 10.5.100.2 | 37 | vip: "{{ MOJO_OS_VIP02 }}" |
372 | 38 | dashboard-hacluster: | 38 | dashboard-hacluster: |
373 | 39 | charm: hacluster | 39 | charm: hacluster |
374 | 40 | nova-compute: | 40 | nova-compute: |
375 | @@ -51,7 +51,7 @@ | |||
376 | 51 | num_units: 2 | 51 | num_units: 2 |
377 | 52 | options: | 52 | options: |
378 | 53 | network-manager: Neutron | 53 | network-manager: Neutron |
380 | 54 | vip: 10.5.100.3 | 54 | vip: "{{ MOJO_OS_VIP03 }}" |
381 | 55 | ncc-hacluster: | 55 | ncc-hacluster: |
382 | 56 | charm: hacluster | 56 | charm: hacluster |
383 | 57 | neutron-gateway: | 57 | neutron-gateway: |
384 | @@ -67,7 +67,7 @@ | |||
385 | 67 | options: | 67 | options: |
386 | 68 | block-device: "None" | 68 | block-device: "None" |
387 | 69 | glance-api-version: 2 | 69 | glance-api-version: 2 |
389 | 70 | vip: 10.5.100.4 | 70 | vip: "{{ MOJO_OS_VIP04 }}" |
390 | 71 | constraints": mem=1G | 71 | constraints": mem=1G |
391 | 72 | cinder-hacluster: | 72 | cinder-hacluster: |
392 | 73 | charm: hacluster | 73 | charm: hacluster |
393 | @@ -78,7 +78,7 @@ | |||
394 | 78 | constraints: mem=1G | 78 | constraints: mem=1G |
395 | 79 | num_units: 2 | 79 | num_units: 2 |
396 | 80 | options: | 80 | options: |
398 | 81 | vip: 10.5.100.5 | 81 | vip: "{{ MOJO_OS_VIP05 }}" |
399 | 82 | glance-hacluster: | 82 | glance-hacluster: |
400 | 83 | charm: hacluster | 83 | charm: hacluster |
401 | 84 | swift-proxy: | 84 | swift-proxy: |
402 | @@ -89,7 +89,7 @@ | |||
403 | 89 | zone-assignment: manual | 89 | zone-assignment: manual |
404 | 90 | replicas: 3 | 90 | replicas: 3 |
405 | 91 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae | 91 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
407 | 92 | vip: 10.5.100.6 | 92 | vip: "{{ MOJO_OS_VIP06 }}" |
408 | 93 | swift-proxy-hacluster: | 93 | swift-proxy-hacluster: |
409 | 94 | charm: hacluster | 94 | charm: hacluster |
410 | 95 | swift-storage-z1: | 95 | swift-storage-z1: |
411 | @@ -162,7 +162,7 @@ | |||
412 | 162 | constraints: mem=1G | 162 | constraints: mem=1G |
413 | 163 | num_units: 2 | 163 | num_units: 2 |
414 | 164 | options: | 164 | options: |
416 | 165 | vip: 10.5.100.10 | 165 | vip: "{{ MOJO_OS_VIP07 }}" |
417 | 166 | vip_cidr: 16 | 166 | vip_cidr: 16 |
418 | 167 | openstack-percona-database: | 167 | openstack-percona-database: |
419 | 168 | inherits: | 168 | inherits: |
420 | @@ -174,7 +174,7 @@ | |||
421 | 174 | constraints: mem=1G | 174 | constraints: mem=1G |
422 | 175 | num_units: 2 | 175 | num_units: 2 |
423 | 176 | options: | 176 | options: |
425 | 177 | vip: 10.5.100.10 | 177 | vip: "{{ MOJO_OS_VIP08 }}" |
426 | 178 | vip_cidr: 16 | 178 | vip_cidr: 16 |
427 | 179 | root-password: crapper | 179 | root-password: crapper |
428 | 180 | sst-password: crapper | 180 | sst-password: crapper |
429 | @@ -187,7 +187,7 @@ | |||
430 | 187 | constraints: mem=1G | 187 | constraints: mem=1G |
431 | 188 | options: | 188 | options: |
432 | 189 | neutron-security-groups: True | 189 | neutron-security-groups: True |
434 | 190 | vip: 10.5.108.1 | 190 | vip: "{{ MOJO_OS_VIP09 }}" |
435 | 191 | flat-network-providers: physnet1 | 191 | flat-network-providers: physnet1 |
436 | 192 | neutron-api-hacluster: | 192 | neutron-api-hacluster: |
437 | 193 | charm: hacluster | 193 | charm: hacluster |
438 | 194 | 194 | ||
439 | === modified file 'helper/bundles/haphase2.yaml' | |||
440 | --- helper/bundles/haphase2.yaml 2017-09-05 21:37:34 +0000 | |||
441 | +++ helper/bundles/haphase2.yaml 2017-09-11 15:47:43 +0000 | |||
442 | @@ -29,7 +29,7 @@ | |||
443 | 29 | options: | 29 | options: |
444 | 30 | admin-password: openstack | 30 | admin-password: openstack |
445 | 31 | admin-token: ubuntutesting | 31 | admin-token: ubuntutesting |
447 | 32 | vip: 10.5.100.1 | 32 | vip: "{{ MOJO_OS_VIP01 }}" |
448 | 33 | keystone-hacluster: | 33 | keystone-hacluster: |
449 | 34 | charm: hacluster | 34 | charm: hacluster |
450 | 35 | openstack-dashboard: | 35 | openstack-dashboard: |
451 | @@ -37,7 +37,7 @@ | |||
452 | 37 | constraints: mem=1G | 37 | constraints: mem=1G |
453 | 38 | num_units: 2 | 38 | num_units: 2 |
454 | 39 | options: | 39 | options: |
456 | 40 | vip: 10.5.100.2 | 40 | vip: "{{ MOJO_OS_VIP02 }}" |
457 | 41 | dashboard-hacluster: | 41 | dashboard-hacluster: |
458 | 42 | charm: hacluster | 42 | charm: hacluster |
459 | 43 | nova-compute: | 43 | nova-compute: |
460 | @@ -55,7 +55,7 @@ | |||
461 | 55 | options: | 55 | options: |
462 | 56 | network-manager: Neutron | 56 | network-manager: Neutron |
463 | 57 | quantum-security-groups: "yes" | 57 | quantum-security-groups: "yes" |
465 | 58 | vip: 10.5.100.3 | 58 | vip: "{{ MOJO_OS_VIP03 }}" |
466 | 59 | ncc-hacluster: | 59 | ncc-hacluster: |
467 | 60 | charm: hacluster | 60 | charm: hacluster |
468 | 61 | neutron-gateway: | 61 | neutron-gateway: |
469 | @@ -70,7 +70,7 @@ | |||
470 | 70 | options: | 70 | options: |
471 | 71 | block-device: "None" | 71 | block-device: "None" |
472 | 72 | glance-api-version: 2 | 72 | glance-api-version: 2 |
474 | 73 | vip: 10.5.100.4 | 73 | vip: "{{ MOJO_OS_VIP04 }}" |
475 | 74 | constraints": mem=1G | 74 | constraints": mem=1G |
476 | 75 | cinder-hacluster: | 75 | cinder-hacluster: |
477 | 76 | charm: hacluster | 76 | charm: hacluster |
478 | @@ -81,7 +81,7 @@ | |||
479 | 81 | constraints: mem=1G | 81 | constraints: mem=1G |
480 | 82 | num_units: 2 | 82 | num_units: 2 |
481 | 83 | options: | 83 | options: |
483 | 84 | vip: 10.5.100.5 | 84 | vip: "{{ MOJO_OS_VIP05 }}" |
484 | 85 | glance-hacluster: | 85 | glance-hacluster: |
485 | 86 | charm: hacluster | 86 | charm: hacluster |
486 | 87 | swift-proxy: | 87 | swift-proxy: |
487 | @@ -92,7 +92,7 @@ | |||
488 | 92 | zone-assignment: manual | 92 | zone-assignment: manual |
489 | 93 | replicas: 3 | 93 | replicas: 3 |
490 | 94 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae | 94 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
492 | 95 | vip: 10.5.100.6 | 95 | vip: "{{ MOJO_OS_VIP06 }}" |
493 | 96 | swift-proxy-hacluster: | 96 | swift-proxy-hacluster: |
494 | 97 | charm: hacluster | 97 | charm: hacluster |
495 | 98 | swift-storage-z1: | 98 | swift-storage-z1: |
496 | @@ -166,7 +166,7 @@ | |||
497 | 166 | constraints: mem=1G | 166 | constraints: mem=1G |
498 | 167 | num_units: 2 | 167 | num_units: 2 |
499 | 168 | options: | 168 | options: |
501 | 169 | vip: 10.5.100.10 | 169 | vip: "{{ MOJO_OS_VIP07 }}" |
502 | 170 | vip_cidr: 16 | 170 | vip_cidr: 16 |
503 | 171 | openstack-percona-database: | 171 | openstack-percona-database: |
504 | 172 | inherits: | 172 | inherits: |
505 | @@ -178,7 +178,7 @@ | |||
506 | 178 | constraints: mem=1G | 178 | constraints: mem=1G |
507 | 179 | num_units: 2 | 179 | num_units: 2 |
508 | 180 | options: | 180 | options: |
510 | 181 | vip: 10.5.100.10 | 181 | vip: "{{ MOJO_OS_VIP08 }}" |
511 | 182 | vip_cidr: 16 | 182 | vip_cidr: 16 |
512 | 183 | root-password: crapper | 183 | root-password: crapper |
513 | 184 | sst-password: crapper | 184 | sst-password: crapper |
514 | @@ -191,7 +191,7 @@ | |||
515 | 191 | constraints: mem=1G | 191 | constraints: mem=1G |
516 | 192 | options: | 192 | options: |
517 | 193 | neutron-security-groups: True | 193 | neutron-security-groups: True |
519 | 194 | vip: 10.5.108.1 | 194 | vip: "{{ MOJO_OS_VIP09 }}" |
520 | 195 | neutron-api-hacluster: | 195 | neutron-api-hacluster: |
521 | 196 | charm: hacluster | 196 | charm: hacluster |
522 | 197 | options: | 197 | options: |
523 | 198 | 198 | ||
524 | === modified file 'helper/bundles/swift-ha-proxy-phase1.yaml' | |||
525 | --- helper/bundles/swift-ha-proxy-phase1.yaml 2017-09-05 21:37:34 +0000 | |||
526 | +++ helper/bundles/swift-ha-proxy-phase1.yaml 2017-09-11 15:47:43 +0000 | |||
527 | @@ -23,7 +23,7 @@ | |||
528 | 23 | options: | 23 | options: |
529 | 24 | zone-assignment: manual | 24 | zone-assignment: manual |
530 | 25 | replicas: 3 | 25 | replicas: 3 |
532 | 26 | vip: 10.5.100.1 | 26 | vip: "{{ MOJO_OS_VIP01 }}" |
533 | 27 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae | 27 | swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae |
534 | 28 | disable-ring-balance: False | 28 | disable-ring-balance: False |
535 | 29 | swift-storage-z1: | 29 | swift-storage-z1: |
536 | 30 | 30 | ||
537 | === added file 'helper/setup/preflight.py' | |||
538 | --- helper/setup/preflight.py 1970-01-01 00:00:00 +0000 | |||
539 | +++ helper/setup/preflight.py 2017-09-11 15:47:43 +0000 | |||
540 | @@ -0,0 +1,44 @@ | |||
541 | 1 | #!/usr/bin/python | ||
542 | 2 | |||
543 | 3 | import logging | ||
544 | 4 | import os | ||
545 | 5 | |||
546 | 6 | REQUIRED = [ | ||
547 | 7 | 'MOJO_STAGE', | ||
548 | 8 | 'MOJO_WORKSPACE', | ||
549 | 9 | 'MOJO_PROJECT', | ||
550 | 10 | 'MOJO_SERIES', | ||
551 | 11 | 'MOJO_SPEC', | ||
552 | 12 | 'OS_REGION_NAME', | ||
553 | 13 | 'OS_PASSWORD', | ||
554 | 14 | 'OS_AUTH_URL', | ||
555 | 15 | 'OS_USERNAME', | ||
556 | 16 | 'OS_PROJECT_NAME', | ||
557 | 17 | 'MOJO_OS_VIP01', | ||
558 | 18 | 'MOJO_OS_VIP02', | ||
559 | 19 | 'MOJO_OS_VIP03', | ||
560 | 20 | 'MOJO_OS_VIP04', | ||
561 | 21 | 'MOJO_OS_VIP05', | ||
562 | 22 | 'MOJO_OS_VIP06', | ||
563 | 23 | 'MOJO_OS_VIP07', | ||
564 | 24 | 'MOJO_OS_VIP08', | ||
565 | 25 | 'MOJO_OS_VIP09', | ||
566 | 26 | ] | ||
567 | 27 | |||
568 | 28 | |||
569 | 29 | class MissingEnvVariableExeption(Exception): | ||
570 | 30 | pass | ||
571 | 31 | |||
572 | 32 | |||
573 | 33 | logging.info("Running pre-flight check for environment variables") | ||
574 | 34 | for var in REQUIRED: | ||
575 | 35 | if os.environ.get(var) is None: | ||
576 | 36 | raise MissingEnvVariableExeption( | ||
577 | 37 | "The variable, {}, is missing from the environment.\n" | ||
578 | 38 | "Make sure all required variables in the {} " | ||
579 | 39 | "script are available before running mojo\n\n" | ||
580 | 40 | "Required: {}" | ||
581 | 41 | "".format(var, os.path.basename(__file__), | ||
582 | 42 | ", ".join(REQUIRED))) | ||
583 | 43 | |||
584 | 44 | logging.debug("All required environment variables successfully found.") | ||
585 | 0 | 45 | ||
586 | === modified file 'specs/full_stack/next_ha_oneshot/icehouse/manifest' | |||
587 | --- specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-02-22 14:27:58 +0000 | |||
588 | +++ specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-09-11 15:47:43 +0000 | |||
589 | @@ -1,3 +1,6 @@ | |||
590 | 1 | # Validate env variables | ||
591 | 2 | script config=preflight.py | ||
592 | 3 | |||
593 | 1 | # Collect the charm branches from Launchpad | 4 | # Collect the charm branches from Launchpad |
594 | 2 | collect config=collect-next-ha | 5 | collect config=collect-next-ha |
595 | 3 | 6 | ||
596 | 4 | 7 | ||
597 | === added symlink 'specs/full_stack/next_ha_oneshot/icehouse/preflight.py' | |||
598 | === target is u'../../../../helper/setup/preflight.py' | |||
599 | === modified file 'specs/full_stack/next_ha_oneshot/kilo/manifest' | |||
600 | --- specs/full_stack/next_ha_oneshot/kilo/manifest 2017-02-22 14:27:58 +0000 | |||
601 | +++ specs/full_stack/next_ha_oneshot/kilo/manifest 2017-09-11 15:47:43 +0000 | |||
602 | @@ -1,3 +1,6 @@ | |||
603 | 1 | # Validate env variables | ||
604 | 2 | script config=preflight.py | ||
605 | 3 | |||
606 | 1 | # Collect the charm branches from Launchpad | 4 | # Collect the charm branches from Launchpad |
607 | 2 | collect config=collect-next-ha | 5 | collect config=collect-next-ha |
608 | 3 | 6 | ||
609 | 4 | 7 | ||
610 | === added symlink 'specs/full_stack/next_ha_oneshot/kilo/preflight.py' | |||
611 | === target is u'../../../../helper/setup/preflight.py' | |||
612 | === modified file 'specs/full_stack/next_ha_oneshot/liberty/manifest' | |||
613 | --- specs/full_stack/next_ha_oneshot/liberty/manifest 2017-02-22 14:27:58 +0000 | |||
614 | +++ specs/full_stack/next_ha_oneshot/liberty/manifest 2017-09-11 15:47:43 +0000 | |||
615 | @@ -1,3 +1,6 @@ | |||
616 | 1 | # Validate env variables | ||
617 | 2 | script config=preflight.py | ||
618 | 3 | |||
619 | 1 | # Collect the charm branches from Launchpad | 4 | # Collect the charm branches from Launchpad |
620 | 2 | collect config=collect-next-ha | 5 | collect config=collect-next-ha |
621 | 3 | 6 | ||
622 | 4 | 7 | ||
623 | === added symlink 'specs/full_stack/next_ha_oneshot/liberty/preflight.py' | |||
624 | === target is u'../../../../helper/setup/preflight.py' | |||
625 | === modified file 'specs/full_stack/next_ha_oneshot/mitaka/manifest' | |||
626 | --- specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-02-22 14:27:58 +0000 | |||
627 | +++ specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-09-11 15:47:43 +0000 | |||
628 | @@ -1,3 +1,6 @@ | |||
629 | 1 | # Validate env variables | ||
630 | 2 | script config=preflight.py | ||
631 | 3 | |||
632 | 1 | # Collect the charm branches from Launchpad | 4 | # Collect the charm branches from Launchpad |
633 | 2 | collect config=collect-next-ha | 5 | collect config=collect-next-ha |
634 | 3 | 6 | ||
635 | 4 | 7 | ||
636 | === added symlink 'specs/full_stack/next_ha_oneshot/mitaka/preflight.py' | |||
637 | === target is u'../../../../helper/setup/preflight.py' | |||
638 | === modified file 'specs/full_stack/next_ha_oneshot/newton/manifest' | |||
639 | --- specs/full_stack/next_ha_oneshot/newton/manifest 2017-02-22 14:27:58 +0000 | |||
640 | +++ specs/full_stack/next_ha_oneshot/newton/manifest 2017-09-11 15:47:43 +0000 | |||
641 | @@ -1,3 +1,6 @@ | |||
642 | 1 | # Validate env variables | ||
643 | 2 | script config=preflight.py | ||
644 | 3 | |||
645 | 1 | # Collect the charm branches from Launchpad | 4 | # Collect the charm branches from Launchpad |
646 | 2 | collect config=collect-next-ha | 5 | collect config=collect-next-ha |
647 | 3 | 6 | ||
648 | 4 | 7 | ||
649 | === added symlink 'specs/full_stack/next_ha_oneshot/newton/preflight.py' | |||
650 | === target is u'../../../../helper/setup/preflight.py' | |||
651 | === modified file 'specs/full_stack/next_ha_oneshot/ocata/manifest' | |||
652 | --- specs/full_stack/next_ha_oneshot/ocata/manifest 2017-02-22 14:27:58 +0000 | |||
653 | +++ specs/full_stack/next_ha_oneshot/ocata/manifest 2017-09-11 15:47:43 +0000 | |||
654 | @@ -1,3 +1,6 @@ | |||
655 | 1 | # Validate env variables | ||
656 | 2 | script config=preflight.py | ||
657 | 3 | |||
658 | 1 | # Collect the charm branches from Launchpad | 4 | # Collect the charm branches from Launchpad |
659 | 2 | collect config=collect-next-ha | 5 | collect config=collect-next-ha |
660 | 3 | 6 | ||
661 | 4 | 7 | ||
662 | === added symlink 'specs/full_stack/next_ha_oneshot/ocata/preflight.py' | |||
663 | === target is u'../../../../helper/setup/preflight.py' | |||
664 | === modified file 'specs/full_stack/next_ha_oneshot/pike/manifest' | |||
665 | --- specs/full_stack/next_ha_oneshot/pike/manifest 2017-08-30 17:25:03 +0000 | |||
666 | +++ specs/full_stack/next_ha_oneshot/pike/manifest 2017-09-11 15:47:43 +0000 | |||
667 | @@ -1,3 +1,6 @@ | |||
668 | 1 | # Validate env variables | ||
669 | 2 | script config=preflight.py | ||
670 | 3 | |||
671 | 1 | # Collect the charm branches from Launchpad | 4 | # Collect the charm branches from Launchpad |
672 | 2 | collect config=collect-next-ha | 5 | collect config=collect-next-ha |
673 | 3 | 6 | ||
674 | 4 | 7 | ||
675 | === added symlink 'specs/full_stack/next_ha_oneshot/pike/preflight.py' | |||
676 | === target is u'../../../../helper/setup/preflight.py' |
Awesome!