Openstack Mojo Testing

Merge lp:~thedac/openstack-mojo-specs/mojo-openstack-specs-handle-vips into lp:openstack-mojo-specs

  1. mojo-openstack-specs-handle-vips
  2. Merge into mojo-openstack-specs
Proposed by David Ames
Status: Needs review
Proposed branch: lp:~thedac/openstack-mojo-specs/mojo-openstack-specs-handle-vips
Merge into: lp:openstack-mojo-specs
Diff against target: 273 lines (+34/-28)
4 files modified
helper/bundles/ha.yaml (+9/-9)
helper/bundles/haphase1.yaml (+9/-9)
helper/bundles/haphase2.yaml (+9/-9)
helper/utils/mojo_utils.py (+7/-1)
To merge this branch: bzr merge lp:~thedac/openstack-mojo-specs/mojo-openstack-specs-handle-vips
Reviewer Review Type Date Requested Status
Ryan Beisner Needs Information
Review via email: mp+282823@code.launchpad.net

Description of the change

Handle VIPs with {{AMULET_OS_VIP00}} template variables.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #17455 mojo-openstack-specs for thedac mp282823
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17455/

Reply
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #17711 mojo-openstack-specs for thedac mp282823
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17711/

Reply
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Please hold on this, pending further discussion and testing of env var rendering. Thanks!

review: Needs Information
Reply

Unmerged revisions

242. By David Ames

Use {{AMULET_OS_VIP00}}

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/ha.yaml'
2--- helper/bundles/ha.yaml 2015-11-02 17:05:14 +0000
3+++ helper/bundles/ha.yaml 2016-01-16 00:37:54 +0000
4@@ -11,7 +11,7 @@
5 innodb-buffer-pool-size: 200M
6 sst-password: changeme
7 root-password: changeme
8- vip: 10.5.100.1
9+ vip: {{AMULET_OS_VIP00}}
10 mysql-hacluster:
11 charm: hacluster
12 options:
13@@ -39,7 +39,7 @@
14 options:
15 admin-password: openstack
16 admin-token: ubuntutesting
17- vip: 10.5.100.2
18+ vip: {{AMULET_OS_VIP01}}
19 keystone-hacluster:
20 charm: hacluster
21 options:
22@@ -50,7 +50,7 @@
23 constraints: mem=1G
24 num_units: 3
25 options:
26- vip: 10.5.100.3
27+ vip: {{AMULET_OS_VIP02}}
28 dashboard-hacluster:
29 charm: hacluster
30 options:
31@@ -70,7 +70,7 @@
32 options:
33 network-manager: Neutron
34 quantum-security-groups: "yes"
35- vip: 10.5.100.4
36+ vip: {{AMULET_OS_VIP03}}
37 nova-cc-hacluster:
38 charm: hacluster
39 options:
40@@ -88,7 +88,7 @@
41 options:
42 block-device: "None"
43 glance-api-version: 2
44- vip: 10.5.100.5
45+ vip: {{AMULET_OS_VIP04}}
46 cinder-hacluster:
47 charm: hacluster
48 options:
49@@ -101,7 +101,7 @@
50 constraints: mem=1G
51 num_units: 3
52 options:
53- vip: 10.5.100.9
54+ vip: {{AMULET_OS_VIP05}}
55 glance-hacluster:
56 charm: hacluster
57 options:
58@@ -115,7 +115,7 @@
59 zone-assignment: manual
60 replicas: 3
61 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
62- vip: 10.5.100.6
63+ vip: {{AMULET_OS_VIP06}}
64 swift-hacluster:
65 charm: hacluster
66 options:
67@@ -147,7 +147,7 @@
68 constraints: mem=1G
69 num_units: 3
70 options:
71- vip: 10.5.100.7
72+ vip: {{AMULET_OS_VIP07}}
73 ceilometer-hacluster:
74 charm: hacluster
75 options:
76@@ -166,7 +166,7 @@
77 num_units: 3
78 options:
79 neutron-security-groups: True
80- vip: 10.5.100.8
81+ vip: {{AMULET_OS_VIP08}}
82 neutron-hacluster:
83 charm: hacluster
84 options:
85
86=== modified file 'helper/bundles/haphase1.yaml'
87--- helper/bundles/haphase1.yaml 2015-10-20 17:24:13 +0000
88+++ helper/bundles/haphase1.yaml 2016-01-16 00:37:54 +0000
89@@ -26,7 +26,7 @@
90 options:
91 admin-password: openstack
92 admin-token: ubuntutesting
93- vip: 10.5.100.1
94+ vip: {{AMULET_OS_VIP00}}
95 keystone-hacluster:
96 charm: hacluster
97 openstack-dashboard:
98@@ -34,7 +34,7 @@
99 constraints: mem=1G
100 num_units: 2
101 options:
102- vip: 10.5.100.2
103+ vip: {{AMULET_OS_VIP01}}
104 dashboard-hacluster:
105 charm: hacluster
106 nova-compute:
107@@ -52,7 +52,7 @@
108 options:
109 network-manager: Quantum
110 quantum-security-groups: "yes"
111- vip: 10.5.100.3
112+ vip: {{AMULET_OS_VIP02}}
113 ncc-hacluster:
114 charm: hacluster
115 neutron-gateway:
116@@ -67,7 +67,7 @@
117 options:
118 block-device: "None"
119 glance-api-version: 2
120- vip: 10.5.100.4
121+ vip: {{AMULET_OS_VIP03}}
122 constraints": mem=1G
123 cinder-hacluster:
124 charm: hacluster
125@@ -78,7 +78,7 @@
126 constraints: mem=1G
127 num_units: 2
128 options:
129- vip: 10.5.100.5
130+ vip: {{AMULET_OS_VIP04}}
131 glance-hacluster:
132 charm: hacluster
133 swift-proxy:
134@@ -89,7 +89,7 @@
135 zone-assignment: manual
136 replicas: 3
137 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
138- vip: 10.5.100.6
139+ vip: {{AMULET_OS_VIP05}}
140 swift-proxy-hacluster:
141 charm: hacluster
142 swift-storage-z1:
143@@ -121,7 +121,7 @@
144 constraints: mem=1G
145 num_units: 2
146 options:
147- vip: 10.5.100.10
148+ vip: {{AMULET_OS_VIP06}}
149 vip_cidr: 16
150 openstack-percona-database:
151 inherits: openstack-services
152@@ -131,7 +131,7 @@
153 constraints: mem=1G
154 num_units: 2
155 options:
156- vip: 10.5.100.10
157+ vip: {{AMULET_OS_VIP06}}
158 vip_cidr: 16
159 root-password: crapper
160 sst-password: crapper
161@@ -144,7 +144,7 @@
162 constraints: mem=1G
163 options:
164 neutron-security-groups: True
165- vip: 10.5.108.1
166+ vip: {{AMULET_OS_VIP07}}
167 neutron-api-hacluster:
168 charm: hacluster
169 options:
170
171=== modified file 'helper/bundles/haphase2.yaml'
172--- helper/bundles/haphase2.yaml 2015-10-21 20:53:34 +0000
173+++ helper/bundles/haphase2.yaml 2016-01-16 00:37:54 +0000
174@@ -26,7 +26,7 @@
175 options:
176 admin-password: openstack
177 admin-token: ubuntutesting
178- vip: 10.5.100.1
179+ vip: {{AMULET_OS_VIP00}}
180 keystone-hacluster:
181 charm: hacluster
182 openstack-dashboard:
183@@ -34,7 +34,7 @@
184 constraints: mem=1G
185 num_units: 2
186 options:
187- vip: 10.5.100.2
188+ vip: {{AMULET_OS_VIP01}}
189 dashboard-hacluster:
190 charm: hacluster
191 nova-compute:
192@@ -52,7 +52,7 @@
193 options:
194 network-manager: Quantum
195 quantum-security-groups: "yes"
196- vip: 10.5.100.3
197+ vip: {{AMULET_OS_VIP02}}
198 ncc-hacluster:
199 charm: hacluster
200 neutron-gateway:
201@@ -67,7 +67,7 @@
202 options:
203 block-device: "None"
204 glance-api-version: 2
205- vip: 10.5.100.4
206+ vip: {{AMULET_OS_VIP03}}
207 constraints": mem=1G
208 cinder-hacluster:
209 charm: hacluster
210@@ -78,7 +78,7 @@
211 constraints: mem=1G
212 num_units: 2
213 options:
214- vip: 10.5.100.5
215+ vip: {{AMULET_OS_VIP04}}
216 glance-hacluster:
217 charm: hacluster
218 swift-proxy:
219@@ -89,7 +89,7 @@
220 zone-assignment: manual
221 replicas: 3
222 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
223- vip: 10.5.100.6
224+ vip: {{AMULET_OS_VIP05}}
225 swift-proxy-hacluster:
226 charm: hacluster
227 swift-storage-z1:
228@@ -163,7 +163,7 @@
229 constraints: mem=1G
230 num_units: 2
231 options:
232- vip: 10.5.100.10
233+ vip: {{AMULET_OS_VIP06}}
234 vip_cidr: 16
235 openstack-percona-database:
236 inherits:
237@@ -175,7 +175,7 @@
238 constraints: mem=1G
239 num_units: 2
240 options:
241- vip: 10.5.100.10
242+ vip: {{AMULET_OS_VIP06}}
243 vip_cidr: 16
244 root-password: crapper
245 sst-password: crapper
246@@ -188,7 +188,7 @@
247 constraints: mem=1G
248 options:
249 neutron-security-groups: True
250- vip: 10.5.108.1
251+ vip: {{AMULET_OS_VIP07}}
252 neutron-api-hacluster:
253 charm: hacluster
254 options:
255
256=== modified file 'helper/utils/mojo_utils.py'
257--- helper/utils/mojo_utils.py 2016-01-06 15:40:48 +0000
258+++ helper/utils/mojo_utils.py 2016-01-16 00:37:54 +0000
259@@ -521,7 +521,13 @@
260 _vips = [os.environ.get('AMULET_OS_VIP00'),
261 os.environ.get('AMULET_OS_VIP01'),
262 os.environ.get('AMULET_OS_VIP02'),
263- os.environ.get('AMULET_OS_VIP03')]
264+ os.environ.get('AMULET_OS_VIP03'),
265+ os.environ.get('AMULET_OS_VIP04'),
266+ os.environ.get('AMULET_OS_VIP05'),
267+ os.environ.get('AMULET_OS_VIP06'),
268+ os.environ.get('AMULET_OS_VIP07'),
269+ os.environ.get('AMULET_OS_VIP08'),
270+ os.environ.get('AMULET_OS_VIP09')]
271
272 # Env var naming consistent with network.yaml takes priority
273 _keys = ['default_gateway'

Subscribers

People subscribed via source and target branches