Merge "Set os-refresh-config timeout to 4 hours"

2016-07-11 09:30:42 +00:00
parent 869a88d047 301560b35a
commit 7212fd767c
5 changed files with 5 additions and 5 deletions
--- 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:
--- 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:
--- 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:

--- 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
--- 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: