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

[Chris MacNaughton]

[lp:~chris.macnaughton/openstack-mojo-specs/deploy-timeouts]

331. By Chris MacNaughton on 2018-02-14

update to 90 minute timeouts

[Liam Young (gnuoy)]

review: Needs Fixing

[lp:~chris.macnaughton/openstack-mojo-specs/deploy-timeouts]

332. By Chris MacNaughton on 2018-02-15

sed don't fail me now!

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'helper/template/dev/manifest'
--- helper/template/dev/manifest	2015-10-14 17:32:54 +0000
+++ helper/template/dev/manifest	2018-02-15 15:15:48 +0000
@@ -1,6 +1,6 @@
 collect config=collect-next
 
-deploy config=full.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 target=trusty-icehouse
 verify config=check_juju.py
 script config=network_setup.py
 script config=image_setup.py

=== modified file 'specs/deprecated/next_ha_phased/icehouse/manifest'
--- specs/deprecated/next_ha_phased/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/next_ha_phased/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/next_ha_phased/kilo/manifest'
--- specs/deprecated/next_ha_phased/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/next_ha_phased/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/next_ha_phased/liberty/manifest'
--- specs/deprecated/next_ha_phased/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/next_ha_phased/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/next_ha_phased_chaos_pony/icehouse/manifest'
--- specs/deprecated/next_ha_phased_chaos_pony/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/next_ha_phased_chaos_pony/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False --target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False --target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False --target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False --target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/next_ha_phased_chaos_pony/kilo/manifest'
--- specs/deprecated/next_ha_phased_chaos_pony/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/next_ha_phased_chaos_pony/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False --target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False --target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False --target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False --target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/next_ha_phased_chaos_pony/liberty/manifest'
--- specs/deprecated/next_ha_phased_chaos_pony/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/next_ha_phased_chaos_pony/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False --target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False --target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False --target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False --target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/swift_proxy_ha_parallel_scaleout/icehouse/manifest'
--- specs/deprecated/swift_proxy_ha_parallel_scaleout/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/swift_proxy_ha_parallel_scaleout/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -1,13 +1,13 @@
 # Collect the charm branches from Launchpad 
 collect config=collect-next-swift-proxy
 
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
 # Add service relations
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/swift_proxy_ha_parallel_scaleout/kilo/manifest'
--- specs/deprecated/swift_proxy_ha_parallel_scaleout/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/swift_proxy_ha_parallel_scaleout/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -1,13 +1,13 @@
 # Collect the charm branches from Launchpad 
 collect config=collect-next-swift-proxy
 
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
 # Add service relations
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/swift_proxy_ha_parallel_scaleout/liberty/manifest'
--- specs/deprecated/swift_proxy_ha_parallel_scaleout/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/swift_proxy_ha_parallel_scaleout/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -1,13 +1,13 @@
 # Collect the charm branches from Launchpad 
 collect config=collect-next-swift-proxy
 
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
 # Add service relations
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/swift_proxy_ha_parallel_scaleout/mitaka/manifest'
--- specs/deprecated/swift_proxy_ha_parallel_scaleout/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/swift_proxy_ha_parallel_scaleout/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -1,13 +1,13 @@
 # Collect the charm branches from Launchpad 
 collect config=collect-next-swift-proxy
 
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
 # Add service relations
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/deprecated/swift_proxy_ha_parallel_scaleout/newton/manifest'
--- specs/deprecated/swift_proxy_ha_parallel_scaleout/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/deprecated/swift_proxy_ha_parallel_scaleout/newton/manifest	2018-02-15 15:15:48 +0000
@@ -1,13 +1,13 @@
 # Collect the charm branches from Launchpad 
 collect config=collect-next-swift-proxy
 
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
 
 # Add service relations
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/bug1389670/mysql/manifest'
--- specs/dev/bug1389670/mysql/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/bug1389670/mysql/manifest	2018-02-15 15:15:48 +0000
@@ -1,5 +1,5 @@
 collect config=collect-next
-deploy config=next-mysql.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=next-mysql.yaml delay=0 target=trusty-icehouse
 verify config=check_juju.py
 script config=network_setup.py
 script config=image_setup.py

=== modified file 'specs/dev/bug1389670/percona_cluster/manifest'
--- specs/dev/bug1389670/percona_cluster/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/bug1389670/percona_cluster/manifest	2018-02-15 15:15:48 +0000
@@ -1,5 +1,5 @@
 collect config=collect-next
-deploy config=next-percona.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=next-percona.yaml delay=0 target=trusty-icehouse
 verify config=check_juju.py
 script config=network_setup.py
 script config=image_setup.py

=== modified file 'specs/dev/dvr/manifest'
--- specs/dev/dvr/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/dvr/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full_dvr.yaml delay=0 target=trusty-juno
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full_dvr.yaml delay=0 target=trusty-juno
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/full_nrpe/manifest'
--- specs/dev/full_nrpe/manifest	2016-11-08 18:03:27 +0000
+++ specs/dev/full_nrpe/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=next.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=next.yaml delay=0 target=trusty-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/gluster/default/3.7/manifest'
--- specs/dev/gluster/default/3.7/manifest	2017-02-22 14:27:58 +0000
+++ specs/dev/gluster/default/3.7/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-gluster-default
 
 # Use juju deployer with gluster-default.yaml bundle
-deploy config=gluster-default.yaml delay=0 wait=False target=base
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=gluster-default.yaml delay=0 wait=False target=base
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/haproxy_always/manifest'
--- specs/dev/haproxy_always/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/haproxy_always/manifest	2018-02-15 15:15:48 +0000
@@ -1,5 +1,5 @@
 collect config=collect-next
-deploy config=full.yaml delay=0 target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 target=${MOJO_SERIES}-icehouse
 verify config=check_juju.py
 script config=network_setup.py
 script config=image_setup.py

=== modified file 'specs/dev/keystone_ssl/manifest'
--- specs/dev/keystone_ssl/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/keystone_ssl/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=next-ssl.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=next-ssl.yaml delay=0 target=trusty-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/magpie/manifest'
--- specs/dev/magpie/manifest	2016-10-13 21:10:12 +0000
+++ specs/dev/magpie/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-magpie
 
 # Deploy magpie bundle                   
-deploy config=magpie.yaml delay=0 wait=False
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=magpie.yaml delay=0 wait=False
 
 # Wait for deployment to settle
 verify config=check_juju.py

=== modified file 'specs/dev/magpie_baremetal/manifest'
--- specs/dev/magpie_baremetal/manifest	2016-12-09 12:45:32 +0000
+++ specs/dev/magpie_baremetal/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False BUNDLE_FILE=magpie.yaml
 
 # Deploy magpie bundle
-deploy config=magpie.yaml delay=0 wait=False
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=magpie.yaml delay=0 wait=False
 
 # Wait for deployment to settle
 verify config=check_juju.py

=== modified file 'specs/dev/magpie_lxc_baremetal/manifest'
--- specs/dev/magpie_lxc_baremetal/manifest	2016-12-09 12:45:32 +0000
+++ specs/dev/magpie_lxc_baremetal/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False BUNDLE_FILE=magpie-lxc.yaml
 
 # Deploy magpie bundle
-deploy config=magpie-lxc.yaml delay=0 wait=False
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=magpie-lxc.yaml delay=0 wait=False
 
 # Wait for deployment to settle
 verify config=check_juju.py

=== modified file 'specs/dev/multicast_port_change/manifest'
--- specs/dev/multicast_port_change/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/multicast_port_change/manifest	2018-02-15 15:15:48 +0000
@@ -1,7 +1,7 @@
 collect config=collect-next-ha
-deploy config=haphase1.yaml delay=0
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0
 verify config=check_juju.py
-deploy config=haphase2.yaml delay=0
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0
 verify config=check_juju.py
 script config=network_setup.py
 script config=image_setup.py

=== modified file 'specs/dev/neutron_ha/manifest'
--- specs/dev/neutron_ha/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/neutron_ha/manifest	2018-02-15 15:15:48 +0000
@@ -1,5 +1,5 @@
 collect config=collect-next
-deploy config=neutronha.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=neutronha.yaml delay=0 target=trusty-icehouse
 verify config=check_juju.py
 # Horrible sleep as Openstack setup seems to continue with Neutron HA after hooks have finished
 sleep config=180

=== modified file 'specs/dev/next_mini/icehouse/manifest'
--- specs/dev/next_mini/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/dev/next_mini/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/next_mini/liberty/manifest'
--- specs/dev/next_mini/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/dev/next_mini/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/nova_cc_legacy_neutron/manifest'
--- specs/dev/nova_cc_legacy_neutron/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/nova_cc_legacy_neutron/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Deploy legacy mode
-deploy config=next-no-n-api.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=next-no-n-api.yaml delay=0 target=trusty-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/novaccalch/manifest'
--- specs/dev/novaccalch/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/novaccalch/manifest	2018-02-15 15:15:48 +0000
@@ -1,5 +1,5 @@
 collect config=collect-next
-deploy config=full.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 target=trusty-icehouse
 verify config=check_juju.py
 script config=network_setup.py
 script config=image_setup.py

=== modified file 'specs/dev/stable_mini/icehouse/manifest'
--- specs/dev/stable_mini/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/dev/stable_mini/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/stable_mini/liberty/manifest'
--- specs/dev/stable_mini/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/dev/stable_mini/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=mini.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/dev/swift_nrpe/simple_nonha/manifest'
--- specs/dev/swift_nrpe/simple_nonha/manifest	2016-11-08 18:03:27 +0000
+++ specs/dev/swift_nrpe/simple_nonha/manifest	2018-02-15 15:15:48 +0000
@@ -1,5 +1,5 @@
 collect config=collect-swift-proxy
-deploy config=swift-proxy.yaml delay=0 target=trusty-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 target=trusty-icehouse
 verify config=check_juju.py
 script config=image_setup.py
 script config=keystone_setup.py

=== modified file 'specs/dev/vxlan/manifest'
--- specs/dev/vxlan/manifest	2015-10-14 17:32:54 +0000
+++ specs/dev/vxlan/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full_dvr.yaml delay=0 target=trusty-juno
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full_dvr.yaml delay=0 target=trusty-juno
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync/icehouse/manifest'
--- specs/full_stack/next_charmhelper_sync/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync/kilo/manifest'
--- specs/full_stack/next_charmhelper_sync/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync/liberty/manifest'
--- specs/full_stack/next_charmhelper_sync/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync/mitaka/manifest'
--- specs/full_stack/next_charmhelper_sync/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync/newton/manifest'
--- specs/full_stack/next_charmhelper_sync/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync/newton/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync/ocata/manifest'
--- specs/full_stack/next_charmhelper_sync/ocata/manifest	2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_charmhelper_sync/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync/pike/manifest'
--- specs/full_stack/next_charmhelper_sync/pike/manifest	2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_charmhelper_sync/pike/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync_ha/icehouse/manifest'
--- specs/full_stack/next_charmhelper_sync_ha/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync_ha/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -14,7 +14,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync_ha/kilo/manifest'
--- specs/full_stack/next_charmhelper_sync_ha/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync_ha/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -14,7 +14,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_charmhelper_sync_ha/liberty/manifest'
--- specs/full_stack/next_charmhelper_sync_ha/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_charmhelper_sync_ha/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 script config=sync_charmhelpers.py
 
 # Use juju deployer to create the units for the deployment
-deploy config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -14,7 +14,7 @@
 script config=set_vips.py
 
 # Use juju deployer to add the relations for the deployment
-deploy config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=haphase2.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy/icehouse/manifest'
--- specs/full_stack/next_deploy/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy/kilo/manifest'
--- specs/full_stack/next_deploy/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy/liberty/manifest'
--- specs/full_stack/next_deploy/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy/mitaka/manifest'
--- specs/full_stack/next_deploy/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy/newton/manifest'
--- specs/full_stack/next_deploy/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy/ocata/manifest'
--- specs/full_stack/next_deploy/ocata/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy/pike/manifest'
--- specs/full_stack/next_deploy/pike/manifest	2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_deploy/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_baremetal/icehouse/manifest'
--- specs/full_stack/next_deploy_baremetal/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_baremetal/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -9,7 +9,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -23,7 +23,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/kilo/manifest'
--- specs/full_stack/next_deploy_baremetal/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_baremetal/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -8,7 +8,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/liberty/manifest'
--- specs/full_stack/next_deploy_baremetal/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_baremetal/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -8,7 +8,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/mitaka/manifest'
--- specs/full_stack/next_deploy_baremetal/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_baremetal/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -8,7 +8,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/newton/manifest'
--- specs/full_stack/next_deploy_baremetal/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_baremetal/newton/manifest	2018-02-15 15:15:48 +0000
@@ -8,7 +8,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_baremetal/ocata/manifest'
--- specs/full_stack/next_deploy_baremetal/ocata/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_baremetal/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -8,7 +8,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -22,7 +22,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/next_deploy_designate/mitaka/manifest'
--- specs/full_stack/next_deploy_designate/mitaka/manifest	2018-02-10 07:28:22 +0000
+++ specs/full_stack/next_deploy_designate/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-reactive-${MOJO_SERIES}
 
 # Use juju deployer with designate-next-ha.yaml bundle
-deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_designate/newton/manifest'
--- specs/full_stack/next_deploy_designate/newton/manifest	2018-02-10 07:28:22 +0000
+++ specs/full_stack/next_deploy_designate/newton/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-reactive-${MOJO_SERIES}
 
 # Use juju deployer with designate-next-ha.yaml bundle
-deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_designate/ocata/manifest'
--- specs/full_stack/next_deploy_designate/ocata/manifest	2018-02-10 07:28:22 +0000
+++ specs/full_stack/next_deploy_designate/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-reactive-${MOJO_SERIES}
 
 # Use juju deployer with reactive-next.yaml bundle
-deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_designate/pike/manifest'
--- specs/full_stack/next_deploy_designate/pike/manifest	2018-02-10 07:28:22 +0000
+++ specs/full_stack/next_deploy_designate/pike/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-reactive-${MOJO_SERIES}
 
 # Use juju deployer with designate-next-ha.yaml bundle
-deploy config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=designate-next-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_ssl/icehouse/manifest'
--- specs/full_stack/next_deploy_ssl/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_ssl/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_ssl/kilo/manifest'
--- specs/full_stack/next_deploy_ssl/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_ssl/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_ssl/liberty/manifest'
--- specs/full_stack/next_deploy_ssl/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_ssl/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_ssl/mitaka/manifest'
--- specs/full_stack/next_deploy_ssl/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_ssl/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_ssl/newton/manifest'
--- specs/full_stack/next_deploy_ssl/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_ssl/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_ssl/ocata/manifest'
--- specs/full_stack/next_deploy_ssl/ocata/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_deploy_ssl/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_deploy_ssl/pike/manifest'
--- specs/full_stack/next_deploy_ssl/pike/manifest	2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_deploy_ssl/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_dvr/kilo/manifest'
--- specs/full_stack/next_dvr/kilo/manifest	2016-04-12 01:33:56 +0000
+++ specs/full_stack/next_dvr/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_dvr/liberty/manifest'
--- specs/full_stack/next_dvr/liberty/manifest	2016-04-12 01:33:56 +0000
+++ specs/full_stack/next_dvr/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_dvr/mitaka/manifest'
--- specs/full_stack/next_dvr/mitaka/manifest	2016-04-12 01:33:56 +0000
+++ specs/full_stack/next_dvr/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_dvr/newton/manifest'
--- specs/full_stack/next_dvr/newton/manifest	2017-02-10 12:56:11 +0000
+++ specs/full_stack/next_dvr/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_dvr/ocata/manifest'
--- specs/full_stack/next_dvr/ocata/manifest	2017-02-10 12:56:11 +0000
+++ specs/full_stack/next_dvr/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_dvr/pike/manifest'
--- specs/full_stack/next_dvr/pike/manifest	2017-09-06 11:47:49 +0000
+++ specs/full_stack/next_dvr/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-dvr-next.yaml delay=0 target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_ha_oneshot/icehouse/manifest'
--- specs/full_stack/next_ha_oneshot/icehouse/manifest	2017-11-09 11:58:16 +0000
+++ specs/full_stack/next_ha_oneshot/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_ha_oneshot/kilo/manifest'
--- specs/full_stack/next_ha_oneshot/kilo/manifest	2017-11-09 11:58:16 +0000
+++ specs/full_stack/next_ha_oneshot/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_ha_oneshot/liberty/manifest'
--- specs/full_stack/next_ha_oneshot/liberty/manifest	2017-11-09 11:58:16 +0000
+++ specs/full_stack/next_ha_oneshot/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_ha_oneshot/mitaka/manifest'
--- specs/full_stack/next_ha_oneshot/mitaka/manifest	2017-11-09 11:58:16 +0000
+++ specs/full_stack/next_ha_oneshot/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_ha_oneshot/newton/manifest'
--- specs/full_stack/next_ha_oneshot/newton/manifest	2017-11-09 11:58:16 +0000
+++ specs/full_stack/next_ha_oneshot/newton/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_ha_oneshot/ocata/manifest'
--- specs/full_stack/next_ha_oneshot/ocata/manifest	2017-11-09 11:58:16 +0000
+++ specs/full_stack/next_ha_oneshot/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_ha_oneshot/pike/manifest'
--- specs/full_stack/next_ha_oneshot/pike/manifest	2017-11-09 11:58:16 +0000
+++ specs/full_stack/next_ha_oneshot/pike/manifest	2018-02-15 15:15:48 +0000
@@ -5,7 +5,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer to create the units for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike-ha timeout=3600
+deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike-ha timeout=${MOJO_DEPLOY_TIMEOUT:-5400}
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_ha_vrrp/kilo/manifest'
--- specs/full_stack/next_ha_vrrp/kilo/manifest	2016-04-12 01:33:56 +0000
+++ specs/full_stack/next_ha_vrrp/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_ha_vrrp/liberty/manifest'
--- specs/full_stack/next_ha_vrrp/liberty/manifest	2016-04-12 01:33:56 +0000
+++ specs/full_stack/next_ha_vrrp/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_ha_vrrp/mitaka/manifest'
--- specs/full_stack/next_ha_vrrp/mitaka/manifest	2016-07-20 14:21:25 +0000
+++ specs/full_stack/next_ha_vrrp/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_ha_vrrp/newton/manifest'
--- specs/full_stack/next_ha_vrrp/newton/manifest	2017-02-10 13:06:12 +0000
+++ specs/full_stack/next_ha_vrrp/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_ha_vrrp/ocata/manifest'
--- specs/full_stack/next_ha_vrrp/ocata/manifest	2017-02-10 13:06:12 +0000
+++ specs/full_stack/next_ha_vrrp/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_ha_vrrp/pike/manifest'
--- specs/full_stack/next_ha_vrrp/pike/manifest	2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_ha_vrrp/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-ha
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-vrrpha.yaml delay=0 target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_keystone_v3/liberty/manifest'
--- specs/full_stack/next_keystone_v3/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_keystone_v3/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_keystone_v3/mitaka/manifest'
--- specs/full_stack/next_keystone_v3/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_keystone_v3/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_keystone_v3/newton/manifest'
--- specs/full_stack/next_keystone_v3/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_keystone_v3/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_keystone_v3/ocata/manifest'
--- specs/full_stack/next_keystone_v3/ocata/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_keystone_v3/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_keystone_v3/pike/manifest'
--- specs/full_stack/next_keystone_v3/pike/manifest	2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_keystone_v3/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/next_openstack_upgrade/icehouse/manifest'
--- specs/full_stack/next_openstack_upgrade/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_openstack_upgrade/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_openstack_upgrade/kilo/manifest'
--- specs/full_stack/next_openstack_upgrade/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_openstack_upgrade/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_openstack_upgrade/liberty/manifest'
--- specs/full_stack/next_openstack_upgrade/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_openstack_upgrade/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_openstack_upgrade/mitaka/manifest'
--- specs/full_stack/next_openstack_upgrade/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_openstack_upgrade/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-xenial
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_openstack_upgrade/newton/manifest'
--- specs/full_stack/next_openstack_upgrade/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/next_openstack_upgrade/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-xenial
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/next_openstack_upgrade/ocata/manifest'
--- specs/full_stack/next_openstack_upgrade/ocata/manifest	2017-08-30 17:25:03 +0000
+++ specs/full_stack/next_openstack_upgrade/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-xenial
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/odl/liberty/manifest'
--- specs/full_stack/odl/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/odl/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ovs
 
 # Use juju deployer with full.yaml bundle
-deploy config=ovs-odl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-beryllium
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ovs-odl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-beryllium
 
 # Create sdn on overcloud
 script config=network_setup.py

=== modified file 'specs/full_stack/stable_deploy/icehouse/manifest'
--- specs/full_stack/stable_deploy/icehouse/manifest	2017-10-10 16:50:28 +0000
+++ specs/full_stack/stable_deploy/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy/kilo/manifest'
--- specs/full_stack/stable_deploy/kilo/manifest	2017-10-10 16:50:28 +0000
+++ specs/full_stack/stable_deploy/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy/liberty/manifest'
--- specs/full_stack/stable_deploy/liberty/manifest	2017-10-10 16:50:28 +0000
+++ specs/full_stack/stable_deploy/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy/mitaka/manifest'
--- specs/full_stack/stable_deploy/mitaka/manifest	2017-10-10 16:50:28 +0000
+++ specs/full_stack/stable_deploy/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy/newton/manifest'
--- specs/full_stack/stable_deploy/newton/manifest	2017-10-10 16:50:28 +0000
+++ specs/full_stack/stable_deploy/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy/ocata/manifest'
--- specs/full_stack/stable_deploy/ocata/manifest	2017-10-10 16:50:28 +0000
+++ specs/full_stack/stable_deploy/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy/pike/manifest'
--- specs/full_stack/stable_deploy/pike/manifest	2017-10-10 16:50:28 +0000
+++ specs/full_stack/stable_deploy/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy_baremetal/icehouse/manifest'
--- specs/full_stack/stable_deploy_baremetal/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_baremetal/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -12,7 +12,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -26,7 +26,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/stable_deploy_baremetal/kilo/manifest'
--- specs/full_stack/stable_deploy_baremetal/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_baremetal/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -13,7 +13,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -27,7 +27,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/stable_deploy_baremetal/liberty/manifest'
--- specs/full_stack/stable_deploy_baremetal/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_baremetal/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -13,7 +13,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -27,7 +27,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/stable_deploy_baremetal/mitaka/manifest'
--- specs/full_stack/stable_deploy_baremetal/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_baremetal/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -13,7 +13,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -27,7 +27,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/stable_deploy_baremetal/newton/manifest'
--- specs/full_stack/stable_deploy_baremetal/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_baremetal/newton/manifest	2018-02-15 15:15:48 +0000
@@ -13,7 +13,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -27,7 +27,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/stable_deploy_baremetal/ocata/manifest'
--- specs/full_stack/stable_deploy_baremetal/ocata/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_baremetal/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -13,7 +13,7 @@
 script config=scripts/bundle_constrainer_inject_tags.sh lxc=False
 
 # Use juju deployer with baremetal7.yaml bundle
-deploy config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=baremetal7.yaml delay=0 timeout=4500 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -27,7 +27,7 @@
 # Setup keystone users
 script config=keystone_setup.py
 
-# Create and check instances on the deployed cloud
+# Create and check instances on the deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400}ed cloud
 verify config=simple_os_checks.py MACHINES='cirros:m1.tiny:1 precise:m1.small:1' CLOUDINIT_WAIT="300"
 
 # Success

=== modified file 'specs/full_stack/stable_deploy_ssl/icehouse/manifest'
--- specs/full_stack/stable_deploy_ssl/icehouse/manifest	2017-11-06 16:13:46 +0000
+++ specs/full_stack/stable_deploy_ssl/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy_ssl/kilo/manifest'
--- specs/full_stack/stable_deploy_ssl/kilo/manifest	2017-11-06 16:13:46 +0000
+++ specs/full_stack/stable_deploy_ssl/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy_ssl/liberty/manifest'
--- specs/full_stack/stable_deploy_ssl/liberty/manifest	2017-11-06 16:13:46 +0000
+++ specs/full_stack/stable_deploy_ssl/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy_ssl/mitaka/manifest'
--- specs/full_stack/stable_deploy_ssl/mitaka/manifest	2017-11-06 16:13:46 +0000
+++ specs/full_stack/stable_deploy_ssl/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy_ssl/newton/manifest'
--- specs/full_stack/stable_deploy_ssl/newton/manifest	2017-11-06 16:13:46 +0000
+++ specs/full_stack/stable_deploy_ssl/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy_ssl/ocata/manifest'
--- specs/full_stack/stable_deploy_ssl/ocata/manifest	2017-11-06 16:13:46 +0000
+++ specs/full_stack/stable_deploy_ssl/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with full.yaml bundle
-deploy config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full-ssl.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_deploy_tempest/newton/manifest'
--- specs/full_stack/stable_deploy_tempest/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_deploy_tempest/newton/manifest	2018-02-15 15:15:48 +0000
@@ -6,7 +6,7 @@
 
 
 # Use juju deployer with full.yaml bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_keystone_v3/liberty/manifest'
--- specs/full_stack/stable_keystone_v3/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_keystone_v3/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_keystone_v3/mitaka/manifest'
--- specs/full_stack/stable_keystone_v3/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_keystone_v3/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_keystone_v3/newton/manifest'
--- specs/full_stack/stable_keystone_v3/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_keystone_v3/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_keystone_v3/ocata/manifest'
--- specs/full_stack/stable_keystone_v3/ocata/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_keystone_v3/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Use juju deployer with ksv3_full.yaml bundle
-deploy config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ksv3-full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next/icehouse/manifest'
--- specs/full_stack/stable_to_next/icehouse/manifest	2017-09-06 17:45:50 +0000
+++ specs/full_stack/stable_to_next/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Deploy bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Wait for hooks to settle
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next/kilo/manifest'
--- specs/full_stack/stable_to_next/kilo/manifest	2017-09-06 17:45:50 +0000
+++ specs/full_stack/stable_to_next/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Deploy bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Wait for hooks to settle
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next/liberty/manifest'
--- specs/full_stack/stable_to_next/liberty/manifest	2017-09-06 17:45:50 +0000
+++ specs/full_stack/stable_to_next/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Deploy bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Wait for hooks to settle
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next/mitaka/manifest'
--- specs/full_stack/stable_to_next/mitaka/manifest	2017-09-06 17:37:08 +0000
+++ specs/full_stack/stable_to_next/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Deploy bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Wait for hooks to settle
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next/newton/manifest'
--- specs/full_stack/stable_to_next/newton/manifest	2017-09-06 17:45:50 +0000
+++ specs/full_stack/stable_to_next/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Deploy bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Wait for hooks to settle
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next/ocata/manifest'
--- specs/full_stack/stable_to_next/ocata/manifest	2017-09-06 17:45:50 +0000
+++ specs/full_stack/stable_to_next/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-${MOJO_SERIES}
 
 # Deploy bundle
-deploy config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=full.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Wait for hooks to settle
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next_ha/icehouse/manifest'
--- specs/full_stack/stable_to_next_ha/icehouse/manifest	2017-11-29 09:53:14 +0000
+++ specs/full_stack/stable_to_next_ha/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-ha
 
 # Use juju deployer to add the relations for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse-ha
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next_ha/kilo/manifest'
--- specs/full_stack/stable_to_next_ha/kilo/manifest	2017-11-29 09:53:14 +0000
+++ specs/full_stack/stable_to_next_ha/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-ha
 
 # Use juju deployer to add the relations for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo-ha
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next_ha/liberty/manifest'
--- specs/full_stack/stable_to_next_ha/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_to_next_ha/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-ha
 
 # Use juju deployer to add the relations for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty-ha
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next_ha/mitaka/manifest'
--- specs/full_stack/stable_to_next_ha/mitaka/manifest	2017-09-06 21:02:15 +0000
+++ specs/full_stack/stable_to_next_ha/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-ha
 
 # Deploy bundle
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka-ha
 
 # Wait for hooks to settle
 #verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next_ha/newton/manifest'
--- specs/full_stack/stable_to_next_ha/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/full_stack/stable_to_next_ha/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-ha
 
 # Use juju deployer to add the relations for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton-ha
 
 # Check juju statuses are green and that hooks have finished
 #verify config=check_juju.py

=== modified file 'specs/full_stack/stable_to_next_ha/ocata/manifest'
--- specs/full_stack/stable_to_next_ha/ocata/manifest	2017-11-29 09:02:52 +0000
+++ specs/full_stack/stable_to_next_ha/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-stable-ha
 
 # Use juju deployer to add the relations for the deployment
-deploy config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata-ha
 
 # Check juju statuses are green and that hooks have finished
 #verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/icehouse/manifest'
--- specs/storage/ceph/base/icehouse/manifest	2017-09-06 11:42:12 +0000
+++ specs/storage/ceph/base/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/kilo/manifest'
--- specs/storage/ceph/base/kilo/manifest	2017-09-06 11:42:12 +0000
+++ specs/storage/ceph/base/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/liberty/manifest'
--- specs/storage/ceph/base/liberty/manifest	2017-09-06 11:42:12 +0000
+++ specs/storage/ceph/base/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/mitaka/manifest'
--- specs/storage/ceph/base/mitaka/manifest	2017-09-06 11:42:12 +0000
+++ specs/storage/ceph/base/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/newton/manifest'
--- specs/storage/ceph/base/newton/manifest	2017-09-06 11:42:12 +0000
+++ specs/storage/ceph/base/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/ocata/manifest'
--- specs/storage/ceph/base/ocata/manifest	2017-09-06 11:42:12 +0000
+++ specs/storage/ceph/base/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/pike/manifest'
--- specs/storage/ceph/base/pike/manifest	2017-09-06 11:42:12 +0000
+++ specs/storage/ceph/base/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/base/queens/manifest'
--- specs/storage/ceph/base/queens/manifest	2017-12-06 22:15:49 +0000
+++ specs/storage/ceph/base/queens/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-base.yaml bundle
-deploy config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-queens
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-base.yaml delay=0 wait=False target=${MOJO_SERIES}-queens
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/charm_migration/icehouse/manifest'
--- specs/storage/ceph/charm_migration/icehouse/manifest	2017-09-25 19:16:16 +0000
+++ specs/storage/ceph/charm_migration/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with charm-ceph.yaml bundle
-deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
 
 # Use juju deployer with ceph-charm-migration.yaml bundle
-deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/charm_migration/kilo/manifest'
--- specs/storage/ceph/charm_migration/kilo/manifest	2017-09-25 19:16:16 +0000
+++ specs/storage/ceph/charm_migration/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with charm-ceph.yaml bundle
-deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
 
 # Use juju deployer with ceph-charm-migration.yaml bundle
-deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/charm_migration/liberty/manifest'
--- specs/storage/ceph/charm_migration/liberty/manifest	2017-09-25 19:16:16 +0000
+++ specs/storage/ceph/charm_migration/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with charm-ceph.yaml bundle
-deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
 
 # Use juju deployer with ceph-charm-migration.yaml bundle
-deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/charm_migration/mitaka/manifest'
--- specs/storage/ceph/charm_migration/mitaka/manifest	2017-09-25 19:16:16 +0000
+++ specs/storage/ceph/charm_migration/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with charm-ceph.yaml bundle
-deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
 
 # Use juju deployer with ceph-charm-migration.yaml bundle
-deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/charm_migration/newton/manifest'
--- specs/storage/ceph/charm_migration/newton/manifest	2017-09-25 19:16:16 +0000
+++ specs/storage/ceph/charm_migration/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with charm-ceph.yaml bundle
-deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
 
 # Use juju deployer with ceph-charm-migration.yaml bundle
-deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/charm_migration/ocata/manifest'
--- specs/storage/ceph/charm_migration/ocata/manifest	2017-09-25 19:16:16 +0000
+++ specs/storage/ceph/charm_migration/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with charm-ceph.yaml bundle
-deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
 
 # Use juju deployer with ceph-charm-migration.yaml bundle
-deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/charm_migration/pike/manifest'
--- specs/storage/ceph/charm_migration/pike/manifest	2017-11-01 14:51:45 +0000
+++ specs/storage/ceph/charm_migration/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with charm-ceph.yaml bundle
-deploy config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=charm-ceph.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py
@@ -11,7 +11,7 @@
 verify config=test_ceph_store.py APPLICATION=ceph UNITS="0 1"
 
 # Use juju deployer with ceph-charm-migration.yaml bundle
-deploy config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-charm-migration.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/encrypt/icehouse/manifest'
--- specs/storage/ceph/encrypt/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/encrypt/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/encrypt/kilo/manifest'
--- specs/storage/ceph/encrypt/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/encrypt/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/encrypt/liberty/manifest'
--- specs/storage/ceph/encrypt/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/encrypt/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/encrypt/mitaka/manifest'
--- specs/storage/ceph/encrypt/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/encrypt/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/encrypt/newton/manifest'
--- specs/storage/ceph/encrypt/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/encrypt/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/encrypt/ocata/manifest'
--- specs/storage/ceph/encrypt/ocata/manifest	2017-08-30 17:25:03 +0000
+++ specs/storage/ceph/encrypt/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/encrypt/pike/manifest'
--- specs/storage/ceph/encrypt/pike/manifest	2017-08-30 17:25:03 +0000
+++ specs/storage/ceph/encrypt/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-encrypt.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/harden/icehouse/manifest'
--- specs/storage/ceph/harden/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/harden/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/harden/kilo/manifest'
--- specs/storage/ceph/harden/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/harden/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/harden/liberty/manifest'
--- specs/storage/ceph/harden/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/harden/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/harden/mitaka/manifest'
--- specs/storage/ceph/harden/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/harden/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/harden/newton/manifest'
--- specs/storage/ceph/harden/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/harden/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/harden/ocata/manifest'
--- specs/storage/ceph/harden/ocata/manifest	2017-08-30 17:25:03 +0000
+++ specs/storage/ceph/harden/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/harden/pike/manifest'
--- specs/storage/ceph/harden/pike/manifest	2017-08-30 17:25:03 +0000
+++ specs/storage/ceph/harden/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-ceph-default
 
 # Use juju deployer with ceph-default.yaml bundle
-deploy config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=ceph-harden.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw/icehouse/manifest'
--- specs/storage/ceph/radosgw/icehouse/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-${MOJO_SERIES}
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw/kilo/manifest'
--- specs/storage/ceph/radosgw/kilo/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw/liberty/manifest'
--- specs/storage/ceph/radosgw/liberty/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw/mitaka/manifest'
--- specs/storage/ceph/radosgw/mitaka/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw/newton/manifest'
--- specs/storage/ceph/radosgw/newton/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw/ocata/manifest'
--- specs/storage/ceph/radosgw/ocata/manifest	2017-02-22 14:27:58 +0000
+++ specs/storage/ceph/radosgw/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw/pike/manifest'
--- specs/storage/ceph/radosgw/pike/manifest	2017-08-30 19:34:23 +0000
+++ specs/storage/ceph/radosgw/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw_ha/icehouse/manifest'
--- specs/storage/ceph/radosgw_ha/icehouse/manifest	2017-11-23 15:31:58 +0000
+++ specs/storage/ceph/radosgw_ha/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-ha-${MOJO_SERIES}
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw_ha/kilo/manifest'
--- specs/storage/ceph/radosgw_ha/kilo/manifest	2017-11-23 15:31:58 +0000
+++ specs/storage/ceph/radosgw_ha/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-ha
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw_ha/liberty/manifest'
--- specs/storage/ceph/radosgw_ha/liberty/manifest	2017-11-23 15:31:58 +0000
+++ specs/storage/ceph/radosgw_ha/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-ha
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw_ha/mitaka/manifest'
--- specs/storage/ceph/radosgw_ha/mitaka/manifest	2017-11-23 15:31:58 +0000
+++ specs/storage/ceph/radosgw_ha/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-ha
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw_ha/newton/manifest'
--- specs/storage/ceph/radosgw_ha/newton/manifest	2017-11-23 15:31:58 +0000
+++ specs/storage/ceph/radosgw_ha/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-ha
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw_ha/ocata/manifest'
--- specs/storage/ceph/radosgw_ha/ocata/manifest	2017-11-23 15:31:58 +0000
+++ specs/storage/ceph/radosgw_ha/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-ha
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/ceph/radosgw_ha/pike/manifest'
--- specs/storage/ceph/radosgw_ha/pike/manifest	2017-11-23 15:31:58 +0000
+++ specs/storage/ceph/radosgw_ha/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-cephradosgw-ha
 
 # Use juju deployer with cephradosgw-ha.yaml bundle
-deploy config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=cephradosgw-ha.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/base/icehouse/manifest'
--- specs/storage/swift/base/icehouse/manifest	2017-08-30 19:49:29 +0000
+++ specs/storage/swift/base/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploying bundle
-deploy config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/base/kilo/manifest'
--- specs/storage/swift/base/kilo/manifest	2017-08-30 19:49:29 +0000
+++ specs/storage/swift/base/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploying bundle
-deploy config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/base/liberty/manifest'
--- specs/storage/swift/base/liberty/manifest	2017-08-30 19:49:29 +0000
+++ specs/storage/swift/base/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploying bundle
-deploy config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/base/mitaka/manifest'
--- specs/storage/swift/base/mitaka/manifest	2017-08-30 19:49:29 +0000
+++ specs/storage/swift/base/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploying bundle
-deploy config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/base/newton/manifest'
--- specs/storage/swift/base/newton/manifest	2017-08-30 19:49:29 +0000
+++ specs/storage/swift/base/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploying bundle
-deploy config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/base/ocata/manifest'
--- specs/storage/swift/base/ocata/manifest	2017-08-30 19:49:29 +0000
+++ specs/storage/swift/base/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploying bundle
-deploy config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/base/pike/manifest'
--- specs/storage/swift/base/pike/manifest	2017-08-30 19:49:29 +0000
+++ specs/storage/swift/base/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploying bundle
-deploy config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-proxy.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/ha_serial_scaleout/icehouse/manifest'
--- specs/storage/swift/ha_serial_scaleout/icehouse/manifest	2017-11-23 13:53:35 +0000
+++ specs/storage/swift/ha_serial_scaleout/icehouse/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploy service units
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-icehouse
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/ha_serial_scaleout/kilo/manifest'
--- specs/storage/swift/ha_serial_scaleout/kilo/manifest	2017-11-23 13:53:35 +0000
+++ specs/storage/swift/ha_serial_scaleout/kilo/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploy service units
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-kilo
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/ha_serial_scaleout/liberty/manifest'
--- specs/storage/swift/ha_serial_scaleout/liberty/manifest	2017-11-23 13:53:35 +0000
+++ specs/storage/swift/ha_serial_scaleout/liberty/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploy service units
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-liberty
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/ha_serial_scaleout/mitaka/manifest'
--- specs/storage/swift/ha_serial_scaleout/mitaka/manifest	2017-11-23 11:37:21 +0000
+++ specs/storage/swift/ha_serial_scaleout/mitaka/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploy service units
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-mitaka
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/ha_serial_scaleout/newton/manifest'
--- specs/storage/swift/ha_serial_scaleout/newton/manifest	2017-11-23 13:53:35 +0000
+++ specs/storage/swift/ha_serial_scaleout/newton/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploy service units
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-newton
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/ha_serial_scaleout/ocata/manifest'
--- specs/storage/swift/ha_serial_scaleout/ocata/manifest	2017-11-23 13:53:35 +0000
+++ specs/storage/swift/ha_serial_scaleout/ocata/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploy service units
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-ocata
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py

=== modified file 'specs/storage/swift/ha_serial_scaleout/pike/manifest'
--- specs/storage/swift/ha_serial_scaleout/pike/manifest	2017-11-23 13:53:35 +0000
+++ specs/storage/swift/ha_serial_scaleout/pike/manifest	2018-02-15 15:15:48 +0000
@@ -2,7 +2,7 @@
 collect config=collect-next-swift-proxy
 
 # Deploy service units
-deploy config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
+deploy timeout=${MOJO_DEPLOY_TIMEOUT:-5400} config=swift-ha-proxy-phase1.yaml delay=0 wait=False target=${MOJO_SERIES}-pike
 
 # Check juju statuses are green and that hooks have finished
 verify config=check_juju.py