Merge lp:~dmitriis/openstack-mojo-specs/add-newton-upgrade into lp:openstack-mojo-specs

Proposed by Dmitrii Shcherbakov
Status: Merged
Approved by: Ryan Beisner
Approved revision: 298
Merge reported by: David Ames
Merged at revision: not available
Proposed branch: lp:~dmitriis/openstack-mojo-specs/add-newton-upgrade
Merge into: lp:openstack-mojo-specs
Diff against target: 81 lines (+37/-0)
3 files modified
helper/bundles/full-next.yaml (+10/-0)
specs/full_stack/next_openstack_upgrade/newton/SPEC_INFO.txt (+2/-0)
specs/full_stack/next_openstack_upgrade/newton/manifest (+25/-0)
To merge this branch: bzr merge lp:~dmitriis/openstack-mojo-specs/add-newton-upgrade
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Review via email: mp+317549@code.launchpad.net

Description of the change

Add newton openstack upgrade spec

full_upgrade spec + ocata proposed and staging to full-next.yaml

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Thank you!

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-next.yaml'
2--- helper/bundles/full-next.yaml 2017-02-14 02:06:15 +0000
3+++ helper/bundles/full-next.yaml 2017-02-16 20:27:29 +0000
4@@ -302,6 +302,16 @@
5 overrides:
6 openstack-origin: cloud:xenial-ocata
7 source: cloud:xenial-ocata
8+xenial-ocata-proposed:
9+ inherits: xenial-ocata
10+ overrides:
11+ openstack-origin: cloud:xenial-ocata/proposed
12+ source: cloud:xenial-proposed/ocata
13+xenial-ocata-staging:
14+ inherits: xenial-ocata
15+ overrides:
16+ openstack-origin: ppa:ubuntu-cloud-archive/ocata-staging
17+ source: ppa:ubuntu-cloud-archive/ocata-staging
18 zesty-ocata:
19 inherits: openstack-icehouse
20 series: zesty
21
22=== added directory 'specs/full_stack/next_openstack_upgrade/newton'
23=== added file 'specs/full_stack/next_openstack_upgrade/newton/SPEC_INFO.txt'
24--- specs/full_stack/next_openstack_upgrade/newton/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
25+++ specs/full_stack/next_openstack_upgrade/newton/SPEC_INFO.txt 2017-02-16 20:27:29 +0000
26@@ -0,0 +1,2 @@
27+This spec performs a non-ha deploy using the next charms and then upgrades
28+to the next version of openstack
29
30=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/collect-next-xenial'
31=== target is u'../../../../helper/collect/collect-next-xenial'
32=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/full.yaml'
33=== target is u'../../../../helper/bundles/full-next.yaml'
34=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/image_setup.py'
35=== target is u'../../../../helper/setup/image_setup.py'
36=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/images.yaml'
37=== target is u'../../../../helper/setup/images.yaml'
38=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/keystone_setup.py'
39=== target is u'../../../../helper/setup/keystone_setup.py'
40=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/keystone_users.yaml'
41=== target is u'../../../../helper/setup/keystone_users.yaml'
42=== added file 'specs/full_stack/next_openstack_upgrade/newton/manifest'
43--- specs/full_stack/next_openstack_upgrade/newton/manifest 1970-01-01 00:00:00 +0000
44+++ specs/full_stack/next_openstack_upgrade/newton/manifest 2017-02-16 20:27:29 +0000
45@@ -0,0 +1,25 @@
46+# Collect the charm branches from Launchpad
47+collect config=collect-next-xenial
48+
49+# Use juju deployer with full.yaml bundle
50+deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-newton
51+
52+# Create sdn on overcloud
53+script config=network_setup.py
54+
55+# Setup glance images
56+script config=image_setup.py
57+
58+# Setup keystone users
59+script config=keystone_setup.py
60+
61+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
62+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
63+
64+# Upgrade Openstack
65+script config=upgrade_openstack.py
66+
67+# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
68+verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1' CLOUDINIT_WAIT="300"
69+
70+# Success
71
72=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/network.yaml'
73=== target is u'../../../../helper/setup/network.yaml'
74=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/network_setup.py'
75=== target is u'../../../../helper/setup/network_setup.py'
76=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/simple_os_checks.py'
77=== target is u'../../../../helper/tests/simple_os_checks.py'
78=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/upgrade_openstack.py'
79=== target is u'../../../../helper/setup/upgrade_openstack.py'
80=== added symlink 'specs/full_stack/next_openstack_upgrade/newton/utils'
81=== target is u'../../../../helper/utils'

Subscribers

People subscribed via source and target branches