aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-11 09:30:42 +0000
committerGerrit Code Review <review@openstack.org>2016-07-11 09:30:42 +0000
commit7212fd767cd1d4604d565da3135ec7b594fb4bc1 (patch)
tree90dff12e0601bf6d6d7463dd5c86143d36331d4c
parent869a88d047e4bb9bbc469ba4252e72ef9b5c689d (diff)
parent301560b35aae7b8861e519c705f131ead53bb7f0 (diff)
Merge "Set os-refresh-config timeout to 4 hours"
-rw-r--r--puppet/ceph-storage.yaml2
-rw-r--r--puppet/cinder-storage.yaml2
-rw-r--r--puppet/compute.yaml2
-rw-r--r--puppet/controller.yaml2
-rw-r--r--puppet/swift-storage.yaml2
5 files changed, 5 insertions, 5 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index f461a265..8a43b673 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -94,7 +94,7 @@ parameters:
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
- default: os-refresh-config
+ default: os-refresh-config --timeout 14400
resources:
CephStorage:
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 0cbc4a27..d0f562ed 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -94,7 +94,7 @@ parameters:
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
- default: os-refresh-config
+ default: os-refresh-config --timeout 14400
resources:
BlockStorage:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index c2013b56..7ff0676b 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -319,7 +319,7 @@ parameters:
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
- default: os-refresh-config
+ default: os-refresh-config --timeout 14400
resources:
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index f45cdf31..0d6e4028 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -393,7 +393,7 @@ parameters:
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
- default: os-refresh-config
+ default: os-refresh-config --timeout 14400
parameter_groups:
- label: deprecated
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 74eda89f..dc274dcd 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -115,7 +115,7 @@ parameters:
ConfigCommand:
type: string
description: Command which will be run whenever configuration data changes
- default: os-refresh-config
+ default: os-refresh-config --timeout 14400
resources: