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
=== modified file 'helper/bundles/full-dvr-next.yaml'
--- helper/bundles/full-dvr-next.yaml 2017-09-05 21:37:34 +0000
+++ helper/bundles/full-dvr-next.yaml 2017-09-06 11:48:05 +0000
@@ -267,3 +267,16 @@
267 inherits: openstack-icehouse267 inherits: openstack-icehouse
268 series: zesty268 series: zesty
269269
270# pike
271xenial-pike:
272 inherits: openstack-icehouse
273 series: xenial
274 overrides:
275 openstack-origin: cloud:xenial-pike
276 source: cloud:xenial-pike
277zesty-pike:
278 inherits: openstack-icehouse
279 series: zesty
280 overrides:
281 openstack-origin: cloud:zesty-pike
282 source: cloud:zesty-pike
270283
=== added directory 'specs/full_stack/next_dvr/pike'
=== added file 'specs/full_stack/next_dvr/pike/SPEC_INFO.txt'
--- specs/full_stack/next_dvr/pike/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_dvr/pike/SPEC_INFO.txt 2017-09-06 11:48:05 +0000
@@ -0,0 +1,1 @@
1This spec deploys and tests a deployment with neutron DVR enabled
02
=== added symlink 'specs/full_stack/next_dvr/pike/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/next_dvr/pike/collect-next'
=== target is u'../../../../helper/collect/collect-next'
=== added symlink 'specs/full_stack/next_dvr/pike/full-dvr-next.yaml'
=== target is u'../../../../helper/bundles/full-dvr-next.yaml'
=== added symlink 'specs/full_stack/next_dvr/pike/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/next_dvr/pike/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/next_dvr/pike/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/next_dvr/pike/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/next_dvr/pike/manifest'
--- specs/full_stack/next_dvr/pike/manifest 1970-01-01 00:00:00 +0000
+++ specs/full_stack/next_dvr/pike/manifest 2017-09-06 11:48:05 +0000
@@ -0,0 +1,22 @@
1# Collect the charm branches from Launchpad
2collect config=collect-next
3
4# Use juju deployer with full.yaml bundle
5deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-pike
6
7# Check juju statuses are green and that hooks have finished
8verify config=check_juju.py
9
10# Create sdn on overcloud
11script config=network_setup.py NET_TOPOLOGY="dvr"
12
13# Setup glance images
14script config=image_setup.py
15
16# Setup keystone users
17script config=keystone_setup.py
18
19# Create 1 * trusty instance on the overcloud
20verify config=simple_os_checks.py MACHINES='trusty:m1.small:1' CLOUDINIT_WAIT="300"
21
22# Success
023
=== added symlink 'specs/full_stack/next_dvr/pike/network.yaml'
=== target is u'../../../../helper/setup/network_dvr.yaml'
=== added symlink 'specs/full_stack/next_dvr/pike/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/next_dvr/pike/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/next_dvr/pike/utils'
=== target is u'../../../../helper/utils'

Subscribers

People subscribed via source and target branches