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

Proposed by Chris MacNaughton on 2017-11-09
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 2017-11-09 Approve on 2017-11-09
Review via email: mp+333452@code.launchpad.net
To post a comment you must log in.

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

David Ames (thedac) wrote :

Makes perfect sense. Merging.

review: Approve
314. By David Ames on 2017-11-09

[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
1=== modified file 'specs/full_stack/next_ha_oneshot/icehouse/manifest'
2--- specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-09-08 22:30:38 +0000
3+++ specs/full_stack/next_ha_oneshot/icehouse/manifest 2017-11-09 12:00:17 +0000
4@@ -5,7 +5,7 @@
5 collect config=collect-next-ha
6
7 # Use juju deployer to create the units for the deployment
8-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha
9+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha timeout=3600
10
11 # Create sdn on overcloud
12 script config=network_setup.py
13
14=== modified file 'specs/full_stack/next_ha_oneshot/kilo/manifest'
15--- specs/full_stack/next_ha_oneshot/kilo/manifest 2017-09-08 22:30:38 +0000
16+++ specs/full_stack/next_ha_oneshot/kilo/manifest 2017-11-09 12:00:17 +0000
17@@ -5,7 +5,7 @@
18 collect config=collect-next-ha
19
20 # Use juju deployer to create the units for the deployment
21-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha
22+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha timeout=3600
23
24 # Create sdn on overcloud
25 script config=network_setup.py
26
27=== modified file 'specs/full_stack/next_ha_oneshot/liberty/manifest'
28--- specs/full_stack/next_ha_oneshot/liberty/manifest 2017-09-08 22:30:38 +0000
29+++ specs/full_stack/next_ha_oneshot/liberty/manifest 2017-11-09 12:00:17 +0000
30@@ -5,7 +5,7 @@
31 collect config=collect-next-ha
32
33 # Use juju deployer to create the units for the deployment
34-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha
35+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha timeout=3600
36
37 # Create sdn on overcloud
38 script config=network_setup.py
39
40=== modified file 'specs/full_stack/next_ha_oneshot/mitaka/manifest'
41--- specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-09-08 22:30:38 +0000
42+++ specs/full_stack/next_ha_oneshot/mitaka/manifest 2017-11-09 12:00:17 +0000
43@@ -5,7 +5,7 @@
44 collect config=collect-next-ha
45
46 # Use juju deployer to create the units for the deployment
47-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha
48+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha timeout=3600
49
50 # Create sdn on overcloud
51 script config=network_setup.py
52
53=== modified file 'specs/full_stack/next_ha_oneshot/newton/manifest'
54--- specs/full_stack/next_ha_oneshot/newton/manifest 2017-09-08 22:30:38 +0000
55+++ specs/full_stack/next_ha_oneshot/newton/manifest 2017-11-09 12:00:17 +0000
56@@ -5,7 +5,7 @@
57 collect config=collect-next-ha
58
59 # Use juju deployer to create the units for the deployment
60-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha
61+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha timeout=3600
62
63 # Create sdn on overcloud
64 script config=network_setup.py
65
66=== modified file 'specs/full_stack/next_ha_oneshot/ocata/manifest'
67--- specs/full_stack/next_ha_oneshot/ocata/manifest 2017-09-08 22:30:38 +0000
68+++ specs/full_stack/next_ha_oneshot/ocata/manifest 2017-11-09 12:00:17 +0000
69@@ -5,7 +5,7 @@
70 collect config=collect-next-ha
71
72 # Use juju deployer to create the units for the deployment
73-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha
74+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha timeout=3600
75
76 # Create sdn on overcloud
77 script config=network_setup.py
78
79=== modified file 'specs/full_stack/next_ha_oneshot/pike/manifest'
80--- specs/full_stack/next_ha_oneshot/pike/manifest 2017-09-08 22:30:38 +0000
81+++ specs/full_stack/next_ha_oneshot/pike/manifest 2017-11-09 12:00:17 +0000
82@@ -5,7 +5,7 @@
83 collect config=collect-next-ha
84
85 # Use juju deployer to create the units for the deployment
86-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike-ha
87+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike-ha timeout=3600
88
89 # Create sdn on overcloud
90 script config=network_setup.py

Subscribers

People subscribed via source and target branches