diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-11 09:16:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-11 09:16:37 +0000 |
| commit | 869a88d047e4bb9bbc469ba4252e72ef9b5c689d (patch) | |
| tree | 325962cde0f0fe2eda0ab0a717376c7ba27a73f0 /puppet | |
| parent | 800ee92b751ccdc8adc3375b765705f0c121f8d9 (diff) | |
| parent | 072b0670cce6d33cc402185731437df63d1782d6 (diff) | |
Merge "Template param for what command occ runs"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 7 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 7 | ||||
| -rw-r--r-- | puppet/compute.yaml | 7 | ||||
| -rw-r--r-- | puppet/controller.yaml | 7 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 7 |
5 files changed, 35 insertions, 0 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index caceb0bc..f461a265 100644 --- a/puppet/ceph-storage.yaml +++ b/puppet/ceph-storage.yaml @@ -91,10 +91,17 @@ parameters: ServiceConfigSettings: type: json default: {} + ConfigCommand: + type: string + description: Command which will be run whenever configuration data changes + default: os-refresh-config resources: CephStorage: type: OS::Nova::Server + metadata: + os-collect-config: + command: {get_param: ConfigCommand} properties: image: {get_param: Image} image_update_policy: {get_param: ImageUpdatePolicy} diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml index ed6afc53..0cbc4a27 100644 --- a/puppet/cinder-storage.yaml +++ b/puppet/cinder-storage.yaml @@ -91,10 +91,17 @@ parameters: ServiceConfigSettings: type: json default: {} + ConfigCommand: + type: string + description: Command which will be run whenever configuration data changes + default: os-refresh-config resources: BlockStorage: type: OS::Nova::Server + metadata: + os-collect-config: + command: {get_param: ConfigCommand} properties: image: {get_param: Image} diff --git a/puppet/compute.yaml b/puppet/compute.yaml index db2d7465..c2013b56 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -316,11 +316,18 @@ parameters: ServiceConfigSettings: type: json default: {} + ConfigCommand: + type: string + description: Command which will be run whenever configuration data changes + default: os-refresh-config resources: NovaCompute: type: OS::Nova::Server + metadata: + os-collect-config: + command: {get_param: ConfigCommand} properties: image: {get_param: Image} diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 101d971e..f45cdf31 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -390,6 +390,10 @@ parameters: ServiceConfigSettings: type: json default: {} + ConfigCommand: + type: string + description: Command which will be run whenever configuration data changes + default: os-refresh-config parameter_groups: - label: deprecated @@ -401,6 +405,9 @@ resources: Controller: type: OS::Nova::Server + metadata: + os-collect-config: + command: {get_param: ConfigCommand} properties: image: {get_param: Image} image_update_policy: {get_param: ImageUpdatePolicy} diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index e663fb6d..74eda89f 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -112,11 +112,18 @@ parameters: ServiceConfigSettings: type: json default: {} + ConfigCommand: + type: string + description: Command which will be run whenever configuration data changes + default: os-refresh-config resources: SwiftStorage: type: OS::Nova::Server + metadata: + os-collect-config: + command: {get_param: ConfigCommand} properties: image: {get_param: Image} flavor: {get_param: Flavor} |