Merge lp:~chris.macnaughton/openstack-mojo-specs/bzr-pike into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709

Proposed by Chris MacNaughton on 2017-09-06
Status: Merged
Merged at revision: 322
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/bzr-pike
Merge into: lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709
Diff against target: 77 lines (+36/-0)
3 files modified
helper/bundles/full-dvr-next.yaml (+13/-0)
specs/full_stack/next_dvr/pike/SPEC_INFO.txt (+1/-0)
specs/full_stack/next_dvr/pike/manifest (+22/-0)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/bzr-pike
Reviewer Review Type Date Requested Status
Ryan Beisner 2017-09-06 Approve on 2017-09-06
Review via email: mp+330272@code.launchpad.net

Description of the change

Add the pike specs for specs/full_stack/next_dvr

To post a comment you must log in.

I'm running this spec now

Confirmed working

Ryan Beisner (1chb1n) wrote :

There are merge conflicts. Please resolve and let me know when ready.

review: Needs Fixing
312. By Chris MacNaughton on 2017-09-06

Merged back from tpi

Ryan Beisner (1chb1n) wrote :

`make lint` is failing. Please run that and resolve any issues. Thanks again!

review: Needs Fixing
313. By Chris MacNaughton on 2017-09-06

fix lint

Ryan Beisner (1chb1n) :
Ryan Beisner (1chb1n) wrote :

Thanks for the mods :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/bundles/full-dvr-next.yaml'
2--- helper/bundles/full-dvr-next.yaml 2017-09-05 21:37:34 +0000
3+++ helper/bundles/full-dvr-next.yaml 2017-09-06 11:48:05 +0000
4@@ -267,3 +267,16 @@
5 inherits: openstack-icehouse
6 series: zesty
7
8+# pike
9+xenial-pike:
10+ inherits: openstack-icehouse
11+ series: xenial
12+ overrides:
13+ openstack-origin: cloud:xenial-pike
14+ source: cloud:xenial-pike
15+zesty-pike:
16+ inherits: openstack-icehouse
17+ series: zesty
18+ overrides:
19+ openstack-origin: cloud:zesty-pike
20+ source: cloud:zesty-pike
21
22=== added directory 'specs/full_stack/next_dvr/pike'
23=== added file 'specs/full_stack/next_dvr/pike/SPEC_INFO.txt'
24--- specs/full_stack/next_dvr/pike/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
25+++ specs/full_stack/next_dvr/pike/SPEC_INFO.txt 2017-09-06 11:48:05 +0000
26@@ -0,0 +1,1 @@
27+This spec deploys and tests a deployment with neutron DVR enabled
28
29=== added symlink 'specs/full_stack/next_dvr/pike/check_juju.py'
30=== target is u'../../../../helper/tests/check_juju.py'
31=== added symlink 'specs/full_stack/next_dvr/pike/collect-next'
32=== target is u'../../../../helper/collect/collect-next'
33=== added symlink 'specs/full_stack/next_dvr/pike/full-dvr-next.yaml'
34=== target is u'../../../../helper/bundles/full-dvr-next.yaml'
35=== added symlink 'specs/full_stack/next_dvr/pike/image_setup.py'
36=== target is u'../../../../helper/setup/image_setup.py'
37=== added symlink 'specs/full_stack/next_dvr/pike/images.yaml'
38=== target is u'../../../../helper/setup/images.yaml'
39=== added symlink 'specs/full_stack/next_dvr/pike/keystone_setup.py'
40=== target is u'../../../../helper/setup/keystone_setup.py'
41=== added symlink 'specs/full_stack/next_dvr/pike/keystone_users.yaml'
42=== target is u'../../../../helper/setup/keystone_users.yaml'
43=== added file 'specs/full_stack/next_dvr/pike/manifest'
44--- specs/full_stack/next_dvr/pike/manifest 1970-01-01 00:00:00 +0000
45+++ specs/full_stack/next_dvr/pike/manifest 2017-09-06 11:48:05 +0000
46@@ -0,0 +1,22 @@
47+# Collect the charm branches from Launchpad
48+collect config=collect-next
49+
50+# Use juju deployer with full.yaml bundle
51+deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-pike
52+
53+# Check juju statuses are green and that hooks have finished
54+verify config=check_juju.py
55+
56+# Create sdn on overcloud
57+script config=network_setup.py NET_TOPOLOGY="dvr"
58+
59+# Setup glance images
60+script config=image_setup.py
61+
62+# Setup keystone users
63+script config=keystone_setup.py
64+
65+# Create 1 * trusty instance on the overcloud
66+verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
67+
68+# Success
69
70=== added symlink 'specs/full_stack/next_dvr/pike/network.yaml'
71=== target is u'../../../../helper/setup/network_dvr.yaml'
72=== added symlink 'specs/full_stack/next_dvr/pike/network_setup.py'
73=== target is u'../../../../helper/setup/network_setup.py'
74=== added symlink 'specs/full_stack/next_dvr/pike/simple_os_checks.py'
75=== target is u'../../../../helper/tests/simple_os_checks.py'
76=== added symlink 'specs/full_stack/next_dvr/pike/utils'
77=== target is u'../../../../helper/utils'

Subscribers

People subscribed via source and target branches