Set os-refresh-config timeout to 4 hours

This change uses the new os-refresh-config --timeout argument to set a
kill timeout for stalled os-refresh-config runs.

4 hours is a reasonable conservative value since it matches the stack
timeout - but it can be set shorter in the future based on actual run
times.

Change-Id: I433f558515df24736263ec0d50de08ad8f78498f
Closes-Bug: #1595722
DependsOn: Ibcbb2090aed126abec8dac49efa53ecbdb2b9b2c

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index d423492..09f1477 100644 (file)
--- 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 0bac1a4..cd11a19 100644 (file)
--- 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 db398f1..31199d7 100644 (file)
--- 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 f6d63d1..c2e9514 100644 (file)
--- 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 accbbfc..e5afc31 100644 (file)
--- 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: