Openstack Mojo Testing

Merge lp:~1chb1n/openstack-mojo-specs/lp1566101 into lp:openstack-mojo-specs

  1. lp1566101
  2. Merge into mojo-openstack-specs
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 246
Proposed branch: lp:~1chb1n/openstack-mojo-specs/lp1566101
Merge into: lp:openstack-mojo-specs
Diff against target: 598 lines (+374/-4)
17 files modified
helper/setup/network_setup.py (+2/-0)
helper/utils/mojo_os_utils.py (+1/-1)
helper/utils/mojo_utils.py (+13/-3)
specs/dev/next_mini/README.md (+39/-0)
specs/dev/next_mini/icehouse/SPEC_INFO.txt (+2/-0)
specs/dev/next_mini/icehouse/manifest (+22/-0)
specs/dev/next_mini/images.yaml (+10/-0)
specs/dev/next_mini/liberty/SPEC_INFO.txt (+2/-0)
specs/dev/next_mini/liberty/manifest (+22/-0)
specs/dev/next_mini/mini.yaml (+82/-0)
specs/dev/stable_mini/README.md (+39/-0)
specs/dev/stable_mini/icehouse/SPEC_INFO.txt (+2/-0)
specs/dev/stable_mini/icehouse/manifest (+22/-0)
specs/dev/stable_mini/images.yaml (+10/-0)
specs/dev/stable_mini/liberty/SPEC_INFO.txt (+2/-0)
specs/dev/stable_mini/liberty/manifest (+22/-0)
specs/dev/stable_mini/mini.yaml (+82/-0)
To merge this branch: bzr merge lp:~1chb1n/openstack-mojo-specs/lp1566101
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+290941@code.launchpad.net

Commit message

Fix for scenarios where preferred-api-version may not exist;
Add dev/mini spec bundle for tooling validation use;
Fix trace in attempted raise when ssh check fails;

Description of the change

Fix for scenarios where preferred-api-version may not exist;
Add dev/mini spec bundle for tooling validation use;
Fix trace in attempted raise when ssh check fails;

Mojo spec helpers and tests were recently updated to pivot keystone auth on existence of a new charm config option which only exists in the next/master charms. This was causing the post-deployment spec helpers to trace in a few places when exercising the stable charm set.

FWIW, the mini specs take right at 30 min in automation, whereas the full_stack specs take nearly 50. Same post-deployment tests. It's just an easier way to iterate on clearing up these type of issues. Some day, I'll probably finish those minis and move them out of dev, but that's not a priority in this pass.

https://bugs.launchpad.net/openstack-mojo-specs/+bug/1566101

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

charm_lint_check #2168 mojo-openstack-specs for 1chb1n mp290941
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2168/

Revision history for this message
Liam Young (gnuoy) wrote :

LGTM, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/setup/network_setup.py'
2--- helper/setup/network_setup.py 2016-03-31 07:44:24 +0000
3+++ helper/setup/network_setup.py 2016-04-05 04:21:42 +0000
4@@ -10,9 +10,11 @@
5 overcloud_novarc = mojo_utils.get_overcloud_auth()
6 # Get os clients
7 if overcloud_novarc.get('API_VERSION', 2) == 2:
8+ # V2 explicitly, or assume V2 if not defined
9 keystonec = mojo_os_utils.get_keystone_client(overcloud_novarc)
10 neutronc = mojo_os_utils.get_neutron_client(overcloud_novarc)
11 else:
12+ # Not V2
13 keystone_session = mojo_os_utils.get_keystone_session(overcloud_novarc)
14 keystonec = mojo_os_utils.get_keystone_session_client(keystone_session)
15 neutronc = mojo_os_utils.get_neutron_session_client(keystone_session)
16
17=== modified file 'helper/utils/mojo_os_utils.py'
18--- helper/utils/mojo_os_utils.py 2016-03-31 09:59:11 +0000
19+++ helper/utils/mojo_os_utils.py 2016-04-05 04:21:42 +0000
20@@ -675,7 +675,7 @@
21 elif image_config[image_name]['auth_type'] == 'privkey':
22 ssh_test_args['privkey'] = privkey
23 if not ssh_test(**ssh_test_args):
24- raise Exception('SSH failed' % (ip))
25+ raise Exception('SSH failed to instance at %s' % (ip))
26
27
28 def check_guest_connectivity(nova_client, ping_wait=180):
29
30=== modified file 'helper/utils/mojo_utils.py'
31--- helper/utils/mojo_utils.py 2016-03-31 07:58:12 +0000
32+++ helper/utils/mojo_utils.py 2016-04-05 04:21:42 +0000
33@@ -224,8 +224,13 @@
34 cmd = ['juju', 'get', service]
35 juju_get_output = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout
36 service_config = yaml.load(juju_get_output)
37- if 'value' in service_config['settings'][option]:
38+
39+ if (option in service_config['settings'] and
40+ 'value' in service_config['settings'][option]):
41 return service_config['settings'][option]['value']
42+ else:
43+ # Stable charms may not yet have the same config keys as next charms
44+ return None
45
46
47 def get_juju_environments_yaml():
48@@ -280,7 +285,10 @@
49 transport = 'http'
50 port = 5000
51 address = get_auth_url()
52- if juju_get('keystone', 'preferred-api-version') == 2:
53+
54+ if juju_get('keystone', 'preferred-api-version') in [2, None]:
55+ # V2 Explicitly, or None when charm does not possess the config key
56+ logging.info('Using keystone API V2 for overcloud auth')
57 auth_settings = {
58 'OS_AUTH_URL': '%s://%s:%i/v2.0' % (transport, address, port),
59 'OS_TENANT_NAME': 'admin',
60@@ -289,7 +297,9 @@
61 'OS_REGION_NAME': 'RegionOne',
62 'API_VERSION': 2,
63 }
64- else:
65+ elif juju_get('keystone', 'preferred-api-version') >= 3:
66+ # V3 or later
67+ logging.info('Using keystone API V3 (or later) for overcloud auth')
68 auth_settings = {
69 'OS_AUTH_URL': '%s://%s:%i/v3' % (transport, address, port),
70 'OS_USERNAME': 'admin',
71
72=== added directory 'specs/dev/next_mini'
73=== added file 'specs/dev/next_mini/README.md'
74--- specs/dev/next_mini/README.md 1970-01-01 00:00:00 +0000
75+++ specs/dev/next_mini/README.md 2016-04-05 04:21:42 +0000
76@@ -0,0 +1,39 @@
77+# Example of the mini deployment:
78+
79+```
80+[Services]
81+NAME STATUS EXPOSED CHARM
82+glance active false local:trusty/glance-150
83+keystone active false local:trusty/keystone-0
84+mysql active false local:trusty/percona-cluster-45
85+neutron-api active false local:trusty/neutron-api-0
86+neutron-gateway active false local:trusty/neutron-gateway-64
87+neutron-openvswitch false local:trusty/neutron-openvswitch-0
88+nova-cloud-controller active false local:trusty/nova-cloud-controller-501
89+nova-compute active false local:trusty/nova-compute-133
90+rabbitmq-server active false local:trusty/rabbitmq-server-150
91+
92+[Units]
93+ID WORKLOAD-STATE AGENT-STATE VERSION MACHINE PORTS PUBLIC-ADDRESS MESSAGE
94+glance/0 active idle 1.25.3 1 9292/tcp 172.17.118.81 Unit is ready
95+keystone/0 active idle 1.25.3 2 172.17.118.82 Unit is ready
96+mysql/0 active idle 1.25.3 3 172.17.118.83 Unit is ready
97+neutron-api/0 active idle 1.25.3 4 9696/tcp 172.17.118.84 Unit is ready
98+neutron-gateway/0 active idle 1.25.3 5 172.17.118.85 Unit is ready
99+nova-cloud-controller/0 active idle 1.25.3 6 8774/tcp,9696/tcp 172.17.118.86 Unit is ready
100+nova-compute/0 active idle 1.25.3 7 172.17.118.3 Unit is ready
101+ neutron-openvswitch/0 active idle 1.25.3 172.17.118.3 Unit is ready
102+rabbitmq-server/0 active idle 1.25.3 8 5672/tcp 172.17.118.4 Unit is ready
103+
104+[Machines]
105+ID STATE VERSION DNS INS-ID SERIES HARDWARE
106+0 started 1.25.3 172.17.118.80 4757052d-92b0-4914-b246-9667f7dfdc37 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
107+1 started 1.25.3 172.17.118.81 9c2580dc-32ec-4a2e-90f3-d2ee40883dfa trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
108+2 started 1.25.3 172.17.118.82 2653dce8-37fb-4f92-b01d-ffc5a88f4209 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
109+3 started 1.25.3 172.17.118.83 3c8c8c9e-3168-4cf1-87d9-7aaa11299407 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
110+4 started 1.25.3 172.17.118.84 3d13702a-3010-4f25-9d0e-20f389e58e3e trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
111+5 started 1.25.3 172.17.118.85 1d1804f4-8e2c-43a5-a947-fbad2dc66d15 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
112+6 started 1.25.3 172.17.118.86 510ecbb4-1ef7-4b81-bff1-95fde6ac71f7 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
113+7 started 1.25.3 172.17.118.3 73f987af-606b-4c60-b039-a76faa40b85b trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
114+8 started 1.25.3 172.17.118.4 b51543e6-90e1-4bdc-b256-3776a6792390 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
115+```
116
117=== added directory 'specs/dev/next_mini/icehouse'
118=== added file 'specs/dev/next_mini/icehouse/SPEC_INFO.txt'
119--- specs/dev/next_mini/icehouse/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
120+++ specs/dev/next_mini/icehouse/SPEC_INFO.txt 2016-04-05 04:21:42 +0000
121@@ -0,0 +1,2 @@
122+This spec performs a minimalist OpenStack deploy using the next charms,
123+generally useful for validating MOJO itself, or other tooling.
124
125=== added symlink 'specs/dev/next_mini/icehouse/check_juju.py'
126=== target is u'../../../../helper/tests/check_juju.py'
127=== added symlink 'specs/dev/next_mini/icehouse/collect-next-precise'
128=== target is u'../../../../helper/collect/collect-next-precise'
129=== added symlink 'specs/dev/next_mini/icehouse/collect-next-trusty'
130=== target is u'../../../../helper/collect/collect-next'
131=== added symlink 'specs/dev/next_mini/icehouse/image_setup.py'
132=== target is u'../../../../helper/setup/image_setup.py'
133=== added symlink 'specs/dev/next_mini/icehouse/images.yaml'
134=== target is u'../images.yaml'
135=== added symlink 'specs/dev/next_mini/icehouse/keystone_setup.py'
136=== target is u'../../../../helper/setup/keystone_setup.py'
137=== added symlink 'specs/dev/next_mini/icehouse/keystone_users.yaml'
138=== target is u'../../../../helper/setup/keystone_users.yaml'
139=== added file 'specs/dev/next_mini/icehouse/manifest'
140--- specs/dev/next_mini/icehouse/manifest 1970-01-01 00:00:00 +0000
141+++ specs/dev/next_mini/icehouse/manifest 2016-04-05 04:21:42 +0000
142@@ -0,0 +1,22 @@
143+# Collect the charm branches from Launchpad
144+collect config=collect-next-${MOJO_SERIES}
145+
146+# Use juju deployer with full.yaml bundle
147+deploy config=mini.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse
148+
149+# Check juju statuses are green and that hooks have finished
150+verify config=check_juju.py
151+
152+# Create sdn on overcloud
153+script config=network_setup.py
154+
155+# Setup glance images
156+script config=image_setup.py
157+
158+# Setup keystone users
159+script config=keystone_setup.py
160+
161+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
162+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
163+
164+# Success
165
166=== added symlink 'specs/dev/next_mini/icehouse/mini.yaml'
167=== target is u'../mini.yaml'
168=== added symlink 'specs/dev/next_mini/icehouse/network.yaml'
169=== target is u'../../../../helper/setup/network.yaml'
170=== added symlink 'specs/dev/next_mini/icehouse/network_setup.py'
171=== target is u'../../../../helper/setup/network_setup.py'
172=== added symlink 'specs/dev/next_mini/icehouse/simple_os_checks.py'
173=== target is u'../../../../helper/tests/simple_os_checks.py'
174=== added symlink 'specs/dev/next_mini/icehouse/utils'
175=== target is u'../../../../helper/utils'
176=== added file 'specs/dev/next_mini/images.yaml'
177--- specs/dev/next_mini/images.yaml 1970-01-01 00:00:00 +0000
178+++ specs/dev/next_mini/images.yaml 2016-04-05 04:21:42 +0000
179@@ -0,0 +1,10 @@
180+cirros:
181+ auth_type: password
182+ bootstring: cubswin:)
183+ password: cubswin:)
184+ username: cirros
185+ container_format: bare
186+ disk_format: qcow2
187+ glance_name: cirros
188+ is_public: 'true'
189+ url: http://10.245.161.162:80/swift/v1/images/cirros-0.3.4-x86_64-disk.img
190
191=== added directory 'specs/dev/next_mini/liberty'
192=== added file 'specs/dev/next_mini/liberty/SPEC_INFO.txt'
193--- specs/dev/next_mini/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
194+++ specs/dev/next_mini/liberty/SPEC_INFO.txt 2016-04-05 04:21:42 +0000
195@@ -0,0 +1,2 @@
196+This spec performs a minimalist OpenStack deploy using the next charms,
197+generally useful for validating MOJO itself, or other tooling.
198
199=== added symlink 'specs/dev/next_mini/liberty/check_juju.py'
200=== target is u'../../../../helper/tests/check_juju.py'
201=== added symlink 'specs/dev/next_mini/liberty/collect-next-trusty'
202=== target is u'../../../../helper/collect/collect-next'
203=== added symlink 'specs/dev/next_mini/liberty/collect-next-wily'
204=== target is u'../../../../helper/collect/collect-next-wily'
205=== added symlink 'specs/dev/next_mini/liberty/image_setup.py'
206=== target is u'../../../../helper/setup/image_setup.py'
207=== added symlink 'specs/dev/next_mini/liberty/images.yaml'
208=== target is u'../images.yaml'
209=== added symlink 'specs/dev/next_mini/liberty/keystone_setup.py'
210=== target is u'../../../../helper/setup/keystone_setup.py'
211=== added symlink 'specs/dev/next_mini/liberty/keystone_users.yaml'
212=== target is u'../../../../helper/setup/keystone_users.yaml'
213=== added file 'specs/dev/next_mini/liberty/manifest'
214--- specs/dev/next_mini/liberty/manifest 1970-01-01 00:00:00 +0000
215+++ specs/dev/next_mini/liberty/manifest 2016-04-05 04:21:42 +0000
216@@ -0,0 +1,22 @@
217+# Collect the charm branches from Launchpad
218+collect config=collect-next-${MOJO_SERIES}
219+
220+# Use juju deployer with full.yaml bundle
221+deploy config=mini.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty
222+
223+# Check juju statuses are green and that hooks have finished
224+verify config=check_juju.py
225+
226+# Create sdn on overcloud
227+script config=network_setup.py
228+
229+# Setup glance images
230+script config=image_setup.py
231+
232+# Setup keystone users
233+script config=keystone_setup.py
234+
235+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
236+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
237+
238+# Success
239
240=== added symlink 'specs/dev/next_mini/liberty/mini.yaml'
241=== target is u'../mini.yaml'
242=== added symlink 'specs/dev/next_mini/liberty/network.yaml'
243=== target is u'../../../../helper/setup/network.yaml'
244=== added symlink 'specs/dev/next_mini/liberty/network_setup.py'
245=== target is u'../../../../helper/setup/network_setup.py'
246=== added symlink 'specs/dev/next_mini/liberty/simple_os_checks.py'
247=== target is u'../../../../helper/tests/simple_os_checks.py'
248=== added symlink 'specs/dev/next_mini/liberty/utils'
249=== target is u'../../../../helper/utils'
250=== added file 'specs/dev/next_mini/mini.yaml'
251--- specs/dev/next_mini/mini.yaml 1970-01-01 00:00:00 +0000
252+++ specs/dev/next_mini/mini.yaml 2016-04-05 04:21:42 +0000
253@@ -0,0 +1,82 @@
254+# A minimal validation bundle, useful for exercising MOJO or other tooling.
255+#
256+openstack-base:
257+ services:
258+ mysql:
259+ charm: mysql
260+ constraints: mem=1G
261+ options:
262+ dataset-size: 50%
263+ rabbitmq-server:
264+ charm: rabbitmq-server
265+ constraints: mem=1G
266+ keystone:
267+ charm: keystone
268+ constraints: mem=1G
269+ options:
270+ admin-password: openstack
271+ admin-token: ubuntutesting
272+ nova-compute:
273+ charm: nova-compute
274+ num_units: 1
275+ constraints: mem=1G
276+ options:
277+ enable-live-migration: True
278+ enable-resize: True
279+ nova-cloud-controller:
280+ charm: nova-cloud-controller
281+ constraints: mem=1G
282+ options:
283+ network-manager: Quantum
284+ quantum-security-groups: "yes"
285+ neutron-gateway:
286+ charm: neutron-gateway
287+ constraints: mem=1G
288+ options:
289+ instance-mtu: 1300
290+ glance:
291+ charm: glance
292+ constraints: mem=1G
293+ neutron-api:
294+ charm: neutron-api
295+ constraints: mem=1G
296+ options:
297+ neutron-security-groups: True
298+ neutron-openvswitch:
299+ charm: neutron-openvswitch
300+ relations:
301+ - [ keystone, mysql ]
302+ - [ nova-cloud-controller, mysql ]
303+ - [ nova-cloud-controller, rabbitmq-server ]
304+ - [ nova-cloud-controller, glance ]
305+ - [ nova-cloud-controller, keystone ]
306+ - [ nova-compute, nova-cloud-controller ]
307+ - [ nova-compute, mysql ]
308+ - - nova-compute
309+ - rabbitmq-server:amqp
310+ - [ nova-compute, glance ]
311+ - [ glance, mysql ]
312+ - [ glance, keystone ]
313+ - [ neutron-gateway, nova-cloud-controller ]
314+ - [ "neutron-gateway:amqp", rabbitmq-server ]
315+ - [ neutron-api, mysql ]
316+ - [ neutron-api, rabbitmq-server ]
317+ - [ neutron-api, nova-cloud-controller ]
318+ - [ neutron-api, neutron-openvswitch ]
319+ - [ neutron-api, keystone ]
320+ - [ neutron-openvswitch, nova-compute ]
321+ - [ neutron-openvswitch, rabbitmq-server ]
322+# icehouse
323+trusty-icehouse:
324+ inherits: openstack-base
325+ series: trusty
326+# liberty
327+trusty-liberty:
328+ inherits: openstack-base
329+ series: trusty
330+ overrides:
331+ openstack-origin: cloud:trusty-liberty
332+ source: cloud:trusty-liberty
333+wily-liberty:
334+ inherits: openstack-base
335+ series: wily
336
337=== added directory 'specs/dev/stable_mini'
338=== added file 'specs/dev/stable_mini/README.md'
339--- specs/dev/stable_mini/README.md 1970-01-01 00:00:00 +0000
340+++ specs/dev/stable_mini/README.md 2016-04-05 04:21:42 +0000
341@@ -0,0 +1,39 @@
342+# Example of the mini deployment:
343+
344+```
345+[Services]
346+NAME STATUS EXPOSED CHARM
347+glance active false local:trusty/glance-150
348+keystone active false local:trusty/keystone-0
349+mysql active false local:trusty/percona-cluster-45
350+neutron-api active false local:trusty/neutron-api-0
351+neutron-gateway active false local:trusty/neutron-gateway-64
352+neutron-openvswitch false local:trusty/neutron-openvswitch-0
353+nova-cloud-controller active false local:trusty/nova-cloud-controller-501
354+nova-compute active false local:trusty/nova-compute-133
355+rabbitmq-server active false local:trusty/rabbitmq-server-150
356+
357+[Units]
358+ID WORKLOAD-STATE AGENT-STATE VERSION MACHINE PORTS PUBLIC-ADDRESS MESSAGE
359+glance/0 active idle 1.25.3 1 9292/tcp 172.17.118.81 Unit is ready
360+keystone/0 active idle 1.25.3 2 172.17.118.82 Unit is ready
361+mysql/0 active idle 1.25.3 3 172.17.118.83 Unit is ready
362+neutron-api/0 active idle 1.25.3 4 9696/tcp 172.17.118.84 Unit is ready
363+neutron-gateway/0 active idle 1.25.3 5 172.17.118.85 Unit is ready
364+nova-cloud-controller/0 active idle 1.25.3 6 8774/tcp,9696/tcp 172.17.118.86 Unit is ready
365+nova-compute/0 active idle 1.25.3 7 172.17.118.3 Unit is ready
366+ neutron-openvswitch/0 active idle 1.25.3 172.17.118.3 Unit is ready
367+rabbitmq-server/0 active idle 1.25.3 8 5672/tcp 172.17.118.4 Unit is ready
368+
369+[Machines]
370+ID STATE VERSION DNS INS-ID SERIES HARDWARE
371+0 started 1.25.3 172.17.118.80 4757052d-92b0-4914-b246-9667f7dfdc37 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
372+1 started 1.25.3 172.17.118.81 9c2580dc-32ec-4a2e-90f3-d2ee40883dfa trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
373+2 started 1.25.3 172.17.118.82 2653dce8-37fb-4f92-b01d-ffc5a88f4209 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
374+3 started 1.25.3 172.17.118.83 3c8c8c9e-3168-4cf1-87d9-7aaa11299407 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
375+4 started 1.25.3 172.17.118.84 3d13702a-3010-4f25-9d0e-20f389e58e3e trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
376+5 started 1.25.3 172.17.118.85 1d1804f4-8e2c-43a5-a947-fbad2dc66d15 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
377+6 started 1.25.3 172.17.118.86 510ecbb4-1ef7-4b81-bff1-95fde6ac71f7 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
378+7 started 1.25.3 172.17.118.3 73f987af-606b-4c60-b039-a76faa40b85b trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
379+8 started 1.25.3 172.17.118.4 b51543e6-90e1-4bdc-b256-3776a6792390 trusty arch=amd64 cpu-cores=1 mem=1536M root-disk=10240M availability-zone=nova
380+```
381
382=== added directory 'specs/dev/stable_mini/icehouse'
383=== added file 'specs/dev/stable_mini/icehouse/SPEC_INFO.txt'
384--- specs/dev/stable_mini/icehouse/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
385+++ specs/dev/stable_mini/icehouse/SPEC_INFO.txt 2016-04-05 04:21:42 +0000
386@@ -0,0 +1,2 @@
387+This spec performs a minimalist OpenStack deploy using the stable charms,
388+generally useful for validating MOJO itself, or other tooling.
389
390=== added symlink 'specs/dev/stable_mini/icehouse/check_juju.py'
391=== target is u'../../../../helper/tests/check_juju.py'
392=== added symlink 'specs/dev/stable_mini/icehouse/collect-stable-trusty'
393=== target is u'../../../../helper/collect/collect-stable-trusty'
394=== added symlink 'specs/dev/stable_mini/icehouse/image_setup.py'
395=== target is u'../../../../helper/setup/image_setup.py'
396=== added symlink 'specs/dev/stable_mini/icehouse/images.yaml'
397=== target is u'../images.yaml'
398=== added symlink 'specs/dev/stable_mini/icehouse/keystone_setup.py'
399=== target is u'../../../../helper/setup/keystone_setup.py'
400=== added symlink 'specs/dev/stable_mini/icehouse/keystone_users.yaml'
401=== target is u'../../../../helper/setup/keystone_users.yaml'
402=== added file 'specs/dev/stable_mini/icehouse/manifest'
403--- specs/dev/stable_mini/icehouse/manifest 1970-01-01 00:00:00 +0000
404+++ specs/dev/stable_mini/icehouse/manifest 2016-04-05 04:21:42 +0000
405@@ -0,0 +1,22 @@
406+# Collect the charm branches from Launchpad
407+collect config=collect-stable-${MOJO_SERIES}
408+
409+# Use juju deployer with full.yaml bundle
410+deploy config=mini.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse
411+
412+# Check juju statuses are green and that hooks have finished
413+verify config=check_juju.py
414+
415+# Create sdn on overcloud
416+script config=network_setup.py
417+
418+# Setup glance images
419+script config=image_setup.py
420+
421+# Setup keystone users
422+script config=keystone_setup.py
423+
424+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
425+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
426+
427+# Success
428
429=== added symlink 'specs/dev/stable_mini/icehouse/mini.yaml'
430=== target is u'../mini.yaml'
431=== added symlink 'specs/dev/stable_mini/icehouse/network.yaml'
432=== target is u'../../../../helper/setup/network.yaml'
433=== added symlink 'specs/dev/stable_mini/icehouse/network_setup.py'
434=== target is u'../../../../helper/setup/network_setup.py'
435=== added symlink 'specs/dev/stable_mini/icehouse/simple_os_checks.py'
436=== target is u'../../../../helper/tests/simple_os_checks.py'
437=== added symlink 'specs/dev/stable_mini/icehouse/utils'
438=== target is u'../../../../helper/utils'
439=== added file 'specs/dev/stable_mini/images.yaml'
440--- specs/dev/stable_mini/images.yaml 1970-01-01 00:00:00 +0000
441+++ specs/dev/stable_mini/images.yaml 2016-04-05 04:21:42 +0000
442@@ -0,0 +1,10 @@
443+cirros:
444+ auth_type: password
445+ bootstring: cubswin:)
446+ password: cubswin:)
447+ username: cirros
448+ container_format: bare
449+ disk_format: qcow2
450+ glance_name: cirros
451+ is_public: 'true'
452+ url: http://10.245.161.162:80/swift/v1/images/cirros-0.3.4-x86_64-disk.img
453
454=== added directory 'specs/dev/stable_mini/liberty'
455=== added file 'specs/dev/stable_mini/liberty/SPEC_INFO.txt'
456--- specs/dev/stable_mini/liberty/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
457+++ specs/dev/stable_mini/liberty/SPEC_INFO.txt 2016-04-05 04:21:42 +0000
458@@ -0,0 +1,2 @@
459+This spec performs a minimalist OpenStack deploy using the stable charms,
460+generally useful for validating MOJO itself, or other tooling.
461
462=== added symlink 'specs/dev/stable_mini/liberty/check_juju.py'
463=== target is u'../../../../helper/tests/check_juju.py'
464=== added symlink 'specs/dev/stable_mini/liberty/collect-stable-trusty'
465=== target is u'../../../../helper/collect/collect-stable-trusty'
466=== added symlink 'specs/dev/stable_mini/liberty/collect-stable-wily'
467=== target is u'../../../../helper/collect/collect-stable-wily'
468=== added symlink 'specs/dev/stable_mini/liberty/image_setup.py'
469=== target is u'../../../../helper/setup/image_setup.py'
470=== added symlink 'specs/dev/stable_mini/liberty/images.yaml'
471=== target is u'../images.yaml'
472=== added symlink 'specs/dev/stable_mini/liberty/keystone_setup.py'
473=== target is u'../../../../helper/setup/keystone_setup.py'
474=== added symlink 'specs/dev/stable_mini/liberty/keystone_users.yaml'
475=== target is u'../../../../helper/setup/keystone_users.yaml'
476=== added file 'specs/dev/stable_mini/liberty/manifest'
477--- specs/dev/stable_mini/liberty/manifest 1970-01-01 00:00:00 +0000
478+++ specs/dev/stable_mini/liberty/manifest 2016-04-05 04:21:42 +0000
479@@ -0,0 +1,22 @@
480+# Collect the charm branches from Launchpad
481+collect config=collect-stable-${MOJO_SERIES}
482+
483+# Use juju deployer with full.yaml bundle
484+deploy config=mini.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty
485+
486+# Check juju statuses are green and that hooks have finished
487+verify config=check_juju.py
488+
489+# Create sdn on overcloud
490+script config=network_setup.py
491+
492+# Setup glance images
493+script config=image_setup.py
494+
495+# Setup keystone users
496+script config=keystone_setup.py
497+
498+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
499+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
500+
501+# Success
502
503=== added symlink 'specs/dev/stable_mini/liberty/mini.yaml'
504=== target is u'../mini.yaml'
505=== added symlink 'specs/dev/stable_mini/liberty/network.yaml'
506=== target is u'../../../../helper/setup/network.yaml'
507=== added symlink 'specs/dev/stable_mini/liberty/network_setup.py'
508=== target is u'../../../../helper/setup/network_setup.py'
509=== added symlink 'specs/dev/stable_mini/liberty/simple_os_checks.py'
510=== target is u'../../../../helper/tests/simple_os_checks.py'
511=== added symlink 'specs/dev/stable_mini/liberty/utils'
512=== target is u'../../../../helper/utils'
513=== added file 'specs/dev/stable_mini/mini.yaml'
514--- specs/dev/stable_mini/mini.yaml 1970-01-01 00:00:00 +0000
515+++ specs/dev/stable_mini/mini.yaml 2016-04-05 04:21:42 +0000
516@@ -0,0 +1,82 @@
517+# A minimal validation bundle, useful for exercising MOJO or other tooling.
518+#
519+openstack-base:
520+ services:
521+ mysql:
522+ charm: mysql
523+ constraints: mem=1G
524+ options:
525+ dataset-size: 50%
526+ rabbitmq-server:
527+ charm: rabbitmq-server
528+ constraints: mem=1G
529+ keystone:
530+ charm: keystone
531+ constraints: mem=1G
532+ options:
533+ admin-password: openstack
534+ admin-token: ubuntutesting
535+ nova-compute:
536+ charm: nova-compute
537+ num_units: 1
538+ constraints: mem=1G
539+ options:
540+ enable-live-migration: True
541+ enable-resize: True
542+ nova-cloud-controller:
543+ charm: nova-cloud-controller
544+ constraints: mem=1G
545+ options:
546+ network-manager: Quantum
547+ quantum-security-groups: "yes"
548+ neutron-gateway:
549+ charm: neutron-gateway
550+ constraints: mem=1G
551+ options:
552+ instance-mtu: 1300
553+ glance:
554+ charm: glance
555+ constraints: mem=1G
556+ neutron-api:
557+ charm: neutron-api
558+ constraints: mem=1G
559+ options:
560+ neutron-security-groups: True
561+ neutron-openvswitch:
562+ charm: neutron-openvswitch
563+ relations:
564+ - [ keystone, mysql ]
565+ - [ nova-cloud-controller, mysql ]
566+ - [ nova-cloud-controller, rabbitmq-server ]
567+ - [ nova-cloud-controller, glance ]
568+ - [ nova-cloud-controller, keystone ]
569+ - [ nova-compute, nova-cloud-controller ]
570+ - [ nova-compute, mysql ]
571+ - - nova-compute
572+ - rabbitmq-server:amqp
573+ - [ nova-compute, glance ]
574+ - [ glance, mysql ]
575+ - [ glance, keystone ]
576+ - [ neutron-gateway, nova-cloud-controller ]
577+ - [ "neutron-gateway:amqp", rabbitmq-server ]
578+ - [ neutron-api, mysql ]
579+ - [ neutron-api, rabbitmq-server ]
580+ - [ neutron-api, nova-cloud-controller ]
581+ - [ neutron-api, neutron-openvswitch ]
582+ - [ neutron-api, keystone ]
583+ - [ neutron-openvswitch, nova-compute ]
584+ - [ neutron-openvswitch, rabbitmq-server ]
585+# icehouse
586+trusty-icehouse:
587+ inherits: openstack-base
588+ series: trusty
589+# liberty
590+trusty-liberty:
591+ inherits: openstack-base
592+ series: trusty
593+ overrides:
594+ openstack-origin: cloud:trusty-liberty
595+ source: cloud:trusty-liberty
596+wily-liberty:
597+ inherits: openstack-base
598+ series: wily

Subscribers

People subscribed via source and target branches