diff options
| author |   Steve Baker <sbaker@redhat.com> | 2016-07-05 11:53:23 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2016-07-05 11:53:23 +1200 |
| commit | 301560b35aae7b8861e519c705f131ead53bb7f0 (patch) | |
| tree | c96ae49ae32a13ee5fd13a571d2b552c52089c74 | |
| parent | 072b0670cce6d33cc402185731437df63d1782d6 (diff) | |
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
| -rw-r--r-- | puppet/ceph-storage.yaml | 2 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 2 | ||||
| -rw-r--r-- | puppet/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/controller.yaml | 2 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index d4234921..09f1477c 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 0bac1a40..cd11a19d 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 db398f17..31199d72 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 f6d63d18..c2e9514b 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 accbbfce..e5afc317 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: |