aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-30 15:56:17 +0000
committerGerrit Code Review <review@openstack.org>2017-01-30 15:56:17 +0000
commitb2c7d8a74846524b857f9e304fa3df465b04d06e (patch)
treef3c53a7c02db1680c9deadd430af3b6227b1090c
parent8a646686edb6822214abd9b91e4b593bcd616e46 (diff)
parentceebfa28c01d8ebb2b4f932224c57dab02b5b451 (diff)
Merge "multinode/upgrade: set heat::rpc_response_timeout to 600"
-rw-r--r--ci/environments/multinode_major_upgrade.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/environments/multinode_major_upgrade.yaml b/ci/environments/multinode_major_upgrade.yaml
index 7de1594..04a9420 100644
--- a/ci/environments/multinode_major_upgrade.yaml
+++ b/ci/environments/multinode_major_upgrade.yaml
@@ -43,4 +43,5 @@ parameter_defaults:
nova::compute::libvirt::libvirt_virt_type: qemu
# Required for Centos 7.3 and Qemu 2.6.0
nova::compute::libvirt::libvirt_cpu_mode: 'none'
+ heat::rpc_response_timeout: 600
SwiftCeilometerPipelineEnabled: False