Merge lp:~thedac/openstack-mojo-specs/17.02-stable-to-next into lp:openstack-mojo-specs

Proposed by David Ames
Status: Merged
Merged at revision: 299
Proposed branch: lp:~thedac/openstack-mojo-specs/17.02-stable-to-next
Merge into: lp:openstack-mojo-specs
Diff against target: 274 lines (+124/-8)
7 files modified
helper/bundles/ha.yaml (+10/-3)
helper/collect/collect-stable-ha (+22/-0)
specs/full_stack/stable_to_next_ha/liberty/manifest (+2/-5)
specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt (+2/-0)
specs/full_stack/stable_to_next_ha/mitaka/manifest (+43/-0)
specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt (+2/-0)
specs/full_stack/stable_to_next_ha/newton/manifest (+43/-0)
To merge this branch: bzr merge lp:~thedac/openstack-mojo-specs/17.02-stable-to-next
Reviewer Review Type Date Requested Status
Ryan Beisner Needs Fixing
Review via email: mp+317879@code.launchpad.net

Description of the change

17.02 Release changes for Stable to Next

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

Please `make lint`:

(!) specs/full_stack/stable_to_next_ha/mitaka
WARNING:root:git_checkout_stable.py is not referenced by the manifest. Can this file be removed?

(!) specs/full_stack/stable_to_next_ha/liberty
WARNING:root:collect-next-ha-trusty is not referenced by the manifest. Can this file be removed?
WARNING:root:collect-stable-ha-trusty is not referenced by the manifest. Can this file be removed?

(!) specs/full_stack/stable_to_next_ha/newton
WARNING:root:git_checkout_stable.py is not referenced by the manifest. Can this file be removed?

review: Needs Fixing
300. By David Ames

Lint fixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'helper/bundles/ha.yaml'
--- helper/bundles/ha.yaml 2017-02-10 11:39:34 +0000
+++ helper/bundles/ha.yaml 2017-02-21 18:47:55 +0000
@@ -70,7 +70,6 @@
70 num_units: 370 num_units: 3
71 options:71 options:
72 network-manager: Neutron72 network-manager: Neutron
73 quantum-security-groups: "yes"
74 vip: 10.5.100.473 vip: 10.5.100.4
75 nova-cc-hacluster:74 nova-cc-hacluster:
76 charm: hacluster75 charm: hacluster
@@ -82,6 +81,7 @@
82 constraints: mem=4G81 constraints: mem=4G
83 options:82 options:
84 instance-mtu: 130083 instance-mtu: 1300
84 bridge-mappings: physnet1:br-ex
85 cinder:85 cinder:
86 charm: cinder86 charm: cinder
87 constraints: mem=1G87 constraints: mem=1G
@@ -272,12 +272,19 @@
272 source: proposed272 source: proposed
273 openstack-origin: distro-proposed273 openstack-origin: distro-proposed
274# ocata274# ocata
275xenial-ocata:275xenial-newton-ha:
276 inherits: openstack-services
277 series: xenial
278 overrides:
279 openstack-origin: cloud:xenial-newton
280 source: cloud:xenial-newton
281# ocata
282xenial-ocata-ha:
276 inherits: openstack-services283 inherits: openstack-services
277 series: xenial284 series: xenial
278 overrides:285 overrides:
279 openstack-origin: cloud:xenial-ocata286 openstack-origin: cloud:xenial-ocata
280 source: cloud:xenial-ocata287 source: cloud:xenial-ocata
281zesty-ocata:288zesty-ocata-ha:
282 inherits: openstack-services289 inherits: openstack-services
283 series: zesty290 series: zesty
284291
=== added file 'helper/collect/collect-stable-ha'
--- helper/collect/collect-stable-ha 1970-01-01 00:00:00 +0000
+++ helper/collect/collect-stable-ha 2017-02-21 18:47:55 +0000
@@ -0,0 +1,22 @@
1ceilometer-agent cs:~openstack-charmers/ceilometer-agent
2ceilometer cs:~openstack-charmers/ceilometer
3ceph cs:~openstack-charmers/ceph
4ceph-osd cs:~openstack-charmers/ceph-osd
5cinder-ceph cs:~openstack-charmers/cinder-ceph
6cinder cs:~openstack-charmers/cinder
7glance cs:~openstack-charmers/glance
8hacluster cs:~openstack-charmers/hacluster
9heat cs:~openstack-charmers/heat
10keystone cs:~openstack-charmers/keystone
11mongodb cs:trusty/mongodb
12neutron-api cs:~openstack-charmers/neutron-api
13neutron-gateway cs:~openstack-charmers/neutron-gateway
14neutron-openvswitch cs:~openstack-charmers/neutron-openvswitch
15nova-cloud-controller cs:~openstack-charmers/nova-cloud-controller
16nova-compute cs:~openstack-charmers/nova-compute
17ntp cs:trusty/ntp
18openstack-dashboard cs:~openstack-charmers/openstack-dashboard
19percona-cluster cs:~openstack-charmers/percona-cluster
20rabbitmq-server cs:~openstack-charmers/rabbitmq-server
21swift-proxy cs:~openstack-charmers/swift-proxy
22swift-storage cs:~openstack-charmers/swift-storage
023
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-next-ha-trusty'
=== target was u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/collect-stable-ha-trusty'
=== target was u'../../../../helper/collect/collect-stable-ha-trusty'
=== removed symlink 'specs/full_stack/stable_to_next_ha/liberty/git_checkout_stable.py'
=== target was u'../../../../helper/setup/git_checkout_stable.py'
=== modified file 'specs/full_stack/stable_to_next_ha/liberty/manifest'
--- specs/full_stack/stable_to_next_ha/liberty/manifest 2016-04-15 19:17:00 +0000
+++ specs/full_stack/stable_to_next_ha/liberty/manifest 2017-02-21 18:47:55 +0000
@@ -1,8 +1,5 @@
1# Collect the charm branches from Launchpad1# Collect the charm branches from Launchpad
2collect config=collect-stable-ha-${MOJO_SERIES}2collect config=collect-stable-ha
3
4# Checkout stable
5script config=git_checkout_stable.py
63
7# Use juju deployer to add the relations for the deployment4# Use juju deployer to add the relations for the deployment
8deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty-ha5deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty-ha
@@ -29,7 +26,7 @@
29script config=wipe_charm_dir.py26script config=wipe_charm_dir.py
3027
31# Collect the next (devel) charm branches from Launchpad28# Collect the next (devel) charm branches from Launchpad
32collect config=collect-next-ha-${MOJO_SERIES}29collect config=collect-next-ha
3330
34# Run upgrade-charm on all services31# Run upgrade-charm on all services
35script config=upgrade_all_services.py32script config=upgrade_all_services.py
3633
=== added directory 'specs/full_stack/stable_to_next_ha/mitaka'
=== added file 'specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/mitaka/SPEC_INFO.txt 2017-02-21 18:47:55 +0000
@@ -0,0 +1,2 @@
1This spec performs a phased ha deploy using the stable charms then upgrades
2charms to the next branches then runs tests to validate the deployment
03
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_to_next_ha/mitaka/manifest'
--- specs/full_stack/stable_to_next_ha/mitaka/manifest 1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/mitaka/manifest 2017-02-21 18:47:55 +0000
@@ -0,0 +1,43 @@
1# Collect the charm branches from Launchpad
2collect config=collect-stable-ha
3
4# Use juju deployer to add the relations for the deployment
5deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-mitaka-ha
6
7# Check juju statuses are green and that hooks have finished
8#verify config=check_juju.py
9
10# Create sdn on overcloud
11script config=network_setup.py
12
13# Setup glance images
14script config=image_setup.py
15
16# Setup keystone users
17script config=keystone_setup.py
18
19# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
20verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
21
22# Test obj store by sending and recieving files
23verify config=test_obj_store.py
24
25# Remove charms directories
26script config=wipe_charm_dir.py
27
28# Collect the next (devel) charm branches from Launchpad
29collect config=collect-next-ha
30
31# Run upgrade-charm on all services
32script config=upgrade_all_services.py
33
34# Check juju statuses are green and that hooks have finished
35verify config=check_juju.py
36
37# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
38verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
39
40# Test obj store by sending and recieving files
41verify config=test_obj_store.py
42
43# Success
044
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next_ha/mitaka/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'
=== added directory 'specs/full_stack/stable_to_next_ha/newton'
=== added file 'specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt'
--- specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt 1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/newton/SPEC_INFO.txt 2017-02-21 18:47:55 +0000
@@ -0,0 +1,2 @@
1This spec performs a phased ha deploy using the stable charms then upgrades
2charms to the next branches then runs tests to validate the deployment
03
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/check_juju.py'
=== target is u'../../../../helper/tests/check_juju.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/collect-next-ha'
=== target is u'../../../../helper/collect/collect-next-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/collect-stable-ha'
=== target is u'../../../../helper/collect/collect-stable-ha'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/ha.yaml'
=== target is u'../../../../helper/bundles/ha.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/image_setup.py'
=== target is u'../../../../helper/setup/image_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/images.yaml'
=== target is u'../../../../helper/setup/images.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/keystone_setup.py'
=== target is u'../../../../helper/setup/keystone_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/keystone_users.yaml'
=== target is u'../../../../helper/setup/keystone_users.yaml'
=== added file 'specs/full_stack/stable_to_next_ha/newton/manifest'
--- specs/full_stack/stable_to_next_ha/newton/manifest 1970-01-01 00:00:00 +0000
+++ specs/full_stack/stable_to_next_ha/newton/manifest 2017-02-21 18:47:55 +0000
@@ -0,0 +1,43 @@
1# Collect the charm branches from Launchpad
2collect config=collect-stable-ha
3
4# Use juju deployer to add the relations for the deployment
5deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-newton-ha
6
7# Check juju statuses are green and that hooks have finished
8#verify config=check_juju.py
9
10# Create sdn on overcloud
11script config=network_setup.py
12
13# Setup glance images
14script config=image_setup.py
15
16# Setup keystone users
17script config=keystone_setup.py
18
19# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
20verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
21
22# Test obj store by sending and recieving files
23verify config=test_obj_store.py
24
25# Remove charms directories
26script config=wipe_charm_dir.py
27
28# Collect the next (devel) charm branches from Launchpad
29collect config=collect-next-ha
30
31# Run upgrade-charm on all services
32script config=upgrade_all_services.py
33
34# Check juju statuses are green and that hooks have finished
35verify config=check_juju.py
36
37# Create 1 * tiny cirros and 1 * small precise instances on the overcloud
38verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:3' CLOUDINIT_WAIT="300"
39
40# Test obj store by sending and recieving files
41verify config=test_obj_store.py
42
43# Success
044
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/network.yaml'
=== target is u'../../../../helper/setup/network.yaml'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/network_setup.py'
=== target is u'../../../../helper/setup/network_setup.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/simple_os_checks.py'
=== target is u'../../../../helper/tests/simple_os_checks.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/test_obj_store.py'
=== target is u'../../../../helper/tests/test_obj_store.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/upgrade_all_services.py'
=== target is u'../../../../helper/setup/upgrade_all_services.py'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/utils'
=== target is u'../../../../helper/utils'
=== added symlink 'specs/full_stack/stable_to_next_ha/newton/wipe_charm_dir.py'
=== target is u'../../../../helper/setup/wipe_charm_dir.py'

Subscribers

People subscribed via source and target branches