Merge lp:~chris.macnaughton/openstack-mojo-specs/update-ha-timeouts into lp:openstack-mojo-specs

Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 314
Proposed branch: lp:~chris.macnaughton/openstack-mojo-specs/update-ha-timeouts
Merge into: lp:openstack-mojo-specs
Diff against target: 90 lines (+7/-7)
7 files modified
specs/full_stack/next_ha_oneshot/icehouse/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/kilo/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/liberty/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/mitaka/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/newton/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/ocata/manifest (+1/-1)
specs/full_stack/next_ha_oneshot/pike/manifest (+1/-1)
To merge this branch: bzr merge lp:~chris.macnaughton/openstack-mojo-specs/update-ha-timeouts
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+333452@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

This deploy timeout change is a delta of 900 seconds from the default of 2700, moving to a deploy limit of 60 minutes

Revision history for this message
David Ames (thedac) wrote :

Makes perfect sense. Merging.

review: Approve
314. By David Ames

[icey, r=thedac] update the ha_oneshot spec to have a higher deploy timeout

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'specs/full_stack/next_ha_oneshot/icehouse/manifest'
--- specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-09-08 22:30:38 +0000
+++ specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-11-09 12:00:17 +0000
@@ -5,7 +5,7 @@
5collect config=collect-next-ha5collect config=collect-next-ha
66
7# Use juju deployer to create the units for the deployment7# Use juju deployer to create the units for the deployment
8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha timeout=3600
99
10# Create sdn on overcloud10# Create sdn on overcloud
11script config=network_setup.py11script config=network_setup.py
1212
=== modified file 'specs/full_stack/next_ha_oneshot/kilo/manifest'
--- specs/full_stack/next_ha_oneshot/kilo/manifest 2017-09-08 22:30:38 +0000
+++ specs/full_stack/next_ha_oneshot/kilo/manifest 2017-11-09 12:00:17 +0000
@@ -5,7 +5,7 @@
5collect config=collect-next-ha5collect config=collect-next-ha
66
7# Use juju deployer to create the units for the deployment7# Use juju deployer to create the units for the deployment
8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha timeout=3600
99
10# Create sdn on overcloud10# Create sdn on overcloud
11script config=network_setup.py11script config=network_setup.py
1212
=== modified file 'specs/full_stack/next_ha_oneshot/liberty/manifest'
--- specs/full_stack/next_ha_oneshot/liberty/manifest 2017-09-08 22:30:38 +0000
+++ specs/full_stack/next_ha_oneshot/liberty/manifest 2017-11-09 12:00:17 +0000
@@ -5,7 +5,7 @@
5collect config=collect-next-ha5collect config=collect-next-ha
66
7# Use juju deployer to create the units for the deployment7# Use juju deployer to create the units for the deployment
8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha timeout=3600
99
10# Create sdn on overcloud10# Create sdn on overcloud
11script config=network_setup.py11script config=network_setup.py
1212
=== modified file 'specs/full_stack/next_ha_oneshot/mitaka/manifest'
--- specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-09-08 22:30:38 +0000
+++ specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-11-09 12:00:17 +0000
@@ -5,7 +5,7 @@
5collect config=collect-next-ha5collect config=collect-next-ha
66
7# Use juju deployer to create the units for the deployment7# Use juju deployer to create the units for the deployment
8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha timeout=3600
99
10# Create sdn on overcloud10# Create sdn on overcloud
11script config=network_setup.py11script config=network_setup.py
1212
=== modified file 'specs/full_stack/next_ha_oneshot/newton/manifest'
--- specs/full_stack/next_ha_oneshot/newton/manifest 2017-09-08 22:30:38 +0000
+++ specs/full_stack/next_ha_oneshot/newton/manifest 2017-11-09 12:00:17 +0000
@@ -5,7 +5,7 @@
5collect config=collect-next-ha5collect config=collect-next-ha
66
7# Use juju deployer to create the units for the deployment7# Use juju deployer to create the units for the deployment
8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha timeout=3600
99
10# Create sdn on overcloud10# Create sdn on overcloud
11script config=network_setup.py11script config=network_setup.py
1212
=== modified file 'specs/full_stack/next_ha_oneshot/ocata/manifest'
--- specs/full_stack/next_ha_oneshot/ocata/manifest 2017-09-08 22:30:38 +0000
+++ specs/full_stack/next_ha_oneshot/ocata/manifest 2017-11-09 12:00:17 +0000
@@ -5,7 +5,7 @@
5collect config=collect-next-ha5collect config=collect-next-ha
66
7# Use juju deployer to create the units for the deployment7# Use juju deployer to create the units for the deployment
8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha timeout=3600
99
10# Create sdn on overcloud10# Create sdn on overcloud
11script config=network_setup.py11script config=network_setup.py
1212
=== modified file 'specs/full_stack/next_ha_oneshot/pike/manifest'
--- specs/full_stack/next_ha_oneshot/pike/manifest 2017-09-08 22:30:38 +0000
+++ specs/full_stack/next_ha_oneshot/pike/manifest 2017-11-09 12:00:17 +0000
@@ -5,7 +5,7 @@
5collect config=collect-next-ha5collect config=collect-next-ha
66
7# Use juju deployer to create the units for the deployment7# Use juju deployer to create the units for the deployment
8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike-ha8deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike-ha timeout=3600
99
10# Create sdn on overcloud10# Create sdn on overcloud
11script config=network_setup.py11script config=network_setup.py

Subscribers

People subscribed via source and target branches