Openstack Mojo Testing

Merge lp:~thedac/openstack-mojo-specs/16.04-changes into lp:openstack-mojo-specs

  1. 16.04-changes
  2. Merge into mojo-openstack-specs
Proposed by David Ames on 2016-04-21
Status: Merged
Merged at revision: 259
Proposed branch: lp:~thedac/openstack-mojo-specs/16.04-changes
Merge into: lp:openstack-mojo-specs
Diff against target: 147 lines (+19/-28)
7 files modified
helper/collect/collect-stable-ha-trusty (+1/-1)
specs/full_stack/stable_to_next/icehouse/manifest (+3/-0)
specs/full_stack/stable_to_next/kilo/manifest (+3/-0)
specs/full_stack/stable_to_next/liberty/manifest (+3/-0)
specs/full_stack/stable_to_next_ha/icehouse/manifest (+3/-9)
specs/full_stack/stable_to_next_ha/kilo/manifest (+3/-9)
specs/full_stack/stable_to_next_ha/liberty/manifest (+3/-9)
To merge this branch: bzr merge lp:~thedac/openstack-mojo-specs/16.04-changes
Reviewer Review Type Date Requested Status
Liam Young 2016-04-21 Approve on 2016-04-21
Review via email: mp+292545@code.launchpad.net

Description of the Change

Changes for stable_to_next* specs for 16.04 release testing

To post a comment you must log in.
Liam Young (gnuoy) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'helper/collect/collect-stable-ha-trusty'
2--- helper/collect/collect-stable-ha-trusty 2016-04-12 08:43:49 +0000
3+++ helper/collect/collect-stable-ha-trusty 2016-04-21 15:24:57 +0000
4@@ -9,7 +9,7 @@
5 hacluster lp:charms/trusty/hacluster
6 heat git://github.com/openstack/charm-heat
7 keystone git://github.com/openstack/charm-keystone
8-mongodb lp:charms/mongodb
9+mongodb lp:charms/trusty/mongodb
10 neutron-api git://github.com/openstack/charm-neutron-api
11 neutron-gateway git://github.com/openstack/charm-neutron-gateway
12 neutron-openvswitch git://github.com/openstack/charm-neutron-openvswitch
13
14=== added symlink 'specs/full_stack/stable_to_next/icehouse/git_checkout_stable.py'
15=== target is u'../../../../helper/setup/git_checkout_stable.py'
16=== modified file 'specs/full_stack/stable_to_next/icehouse/manifest'
17--- specs/full_stack/stable_to_next/icehouse/manifest 2015-10-16 16:24:03 +0000
18+++ specs/full_stack/stable_to_next/icehouse/manifest 2016-04-21 15:24:57 +0000
19@@ -1,6 +1,9 @@
20 # Collect the stable charm branches from Launchpad
21 collect config=collect-stable-${MOJO_SERIES}
22
23+# Checkout stable
24+script config=git_checkout_stable.py
25+
26 # Use juju deployer with full.yaml bundle
27 deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse
28
29
30=== added symlink 'specs/full_stack/stable_to_next/kilo/git_checkout_stable.py'
31=== target is u'../../../../helper/setup/git_checkout_stable.py'
32=== modified file 'specs/full_stack/stable_to_next/kilo/manifest'
33--- specs/full_stack/stable_to_next/kilo/manifest 2015-10-16 16:24:03 +0000
34+++ specs/full_stack/stable_to_next/kilo/manifest 2016-04-21 15:24:57 +0000
35@@ -1,6 +1,9 @@
36 # Collect the stable charm branches from Launchpad
37 collect config=collect-stable-${MOJO_SERIES}
38
39+# Checkout stable
40+script config=git_checkout_stable.py
41+
42 # Use juju deployer with full.yaml bundle
43 deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo
44
45
46=== added symlink 'specs/full_stack/stable_to_next/liberty/git_checkout_stable.py'
47=== target is u'../../../../helper/setup/git_checkout_stable.py'
48=== modified file 'specs/full_stack/stable_to_next/liberty/manifest'
49--- specs/full_stack/stable_to_next/liberty/manifest 2015-10-16 16:24:03 +0000
50+++ specs/full_stack/stable_to_next/liberty/manifest 2016-04-21 15:24:57 +0000
51@@ -1,6 +1,9 @@
52 # Collect the stable charm branches from Launchpad
53 collect config=collect-stable-${MOJO_SERIES}
54
55+# Checkout stable
56+script config=git_checkout_stable.py
57+
58 # Use juju deployer with full.yaml bundle
59 deploy config=full.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty
60
61
62=== added symlink 'specs/full_stack/stable_to_next_ha/icehouse/git_checkout_stable.py'
63=== target is u'../../../../helper/setup/git_checkout_stable.py'
64=== added symlink 'specs/full_stack/stable_to_next_ha/icehouse/ha.yaml'
65=== target is u'../../../../helper/bundles/ha.yaml'
66=== modified file 'specs/full_stack/stable_to_next_ha/icehouse/manifest'
67--- specs/full_stack/stable_to_next_ha/icehouse/manifest 2015-10-20 17:24:13 +0000
68+++ specs/full_stack/stable_to_next_ha/icehouse/manifest 2016-04-21 15:24:57 +0000
69@@ -1,17 +1,11 @@
70 # Collect the charm branches from Launchpad
71 collect config=collect-stable-ha-${MOJO_SERIES}
72
73-# Use juju deployer to create the units for the deployment
74-deploy config=haphase1.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse
75-
76-# Check juju statuses are green and that hooks have finished
77-verify config=check_juju.py
78-
79-# Examine the available networks and set vips for services
80-script config=set_vips.py
81+# Checkout stable
82+script config=git_checkout_stable.py
83
84 # Use juju deployer to add the relations for the deployment
85-deploy config=haphase2.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse
86+deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-icehouse-ha
87
88 # Check juju statuses are green and that hooks have finished
89 verify config=check_juju.py
90
91=== added symlink 'specs/full_stack/stable_to_next_ha/kilo/git_checkout_stable.py'
92=== target is u'../../../../helper/setup/git_checkout_stable.py'
93=== added symlink 'specs/full_stack/stable_to_next_ha/kilo/ha.yaml'
94=== target is u'../../../../helper/bundles/ha.yaml'
95=== modified file 'specs/full_stack/stable_to_next_ha/kilo/manifest'
96--- specs/full_stack/stable_to_next_ha/kilo/manifest 2015-10-16 16:24:03 +0000
97+++ specs/full_stack/stable_to_next_ha/kilo/manifest 2016-04-21 15:24:57 +0000
98@@ -1,17 +1,11 @@
99 # Collect the charm branches from Launchpad
100 collect config=collect-stable-ha-${MOJO_SERIES}
101
102-# Use juju deployer to create the units for the deployment
103-deploy config=haphase1.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo
104-
105-# Check juju statuses are green and that hooks have finished
106-verify config=check_juju.py
107-
108-# Examine the available networks and set vips for services
109-script config=set_vips.py
110+# Checkout stable
111+script config=git_checkout_stable.py
112
113 # Use juju deployer to add the relations for the deployment
114-deploy config=haphase2.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo
115+deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-kilo-ha
116
117 # Check juju statuses are green and that hooks have finished
118 verify config=check_juju.py
119
120=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/git_checkout_stable.py'
121=== target is u'../../../../helper/setup/git_checkout_stable.py'
122=== added symlink 'specs/full_stack/stable_to_next_ha/liberty/ha.yaml'
123=== target is u'../../../../helper/bundles/ha.yaml'
124=== modified file 'specs/full_stack/stable_to_next_ha/liberty/manifest'
125--- specs/full_stack/stable_to_next_ha/liberty/manifest 2015-10-16 16:24:03 +0000
126+++ specs/full_stack/stable_to_next_ha/liberty/manifest 2016-04-21 15:24:57 +0000
127@@ -1,17 +1,11 @@
128 # Collect the charm branches from Launchpad
129 collect config=collect-stable-ha-${MOJO_SERIES}
130
131-# Use juju deployer to create the units for the deployment
132-deploy config=haphase1.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty
133-
134-# Check juju statuses are green and that hooks have finished
135-verify config=check_juju.py
136-
137-# Examine the available networks and set vips for services
138-script config=set_vips.py
139+# Checkout stable
140+script config=git_checkout_stable.py
141
142 # Use juju deployer to add the relations for the deployment
143-deploy config=haphase2.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty
144+deploy config=ha.yaml delay=0 wait=True target=${MOJO_SERIES}-liberty-ha
145
146 # Check juju statuses are green and that hooks have finished
147 verify config=check_juju.py

Subscribers

People subscribed via source and target branches