diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-05-20 15:56:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-05-20 15:56:07 +0000 |
| commit | 46748fdffb57960be79971b6466cc739e052591a (patch) | |
| tree | 11f5b9f93da08d1d301655b23e9ce6bc0b00abd6 | |
| parent | 5de81f897dcdbea2d54e563294dcd36c4a33e4cd (diff) | |
| parent | e9c3d6f06b5577be4e2f91bf8f3ddbb06d913748 (diff) | |
Merge "Specify group os-apply-config for config resources"
| -rw-r--r-- | block-storage.yaml | 1 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 2 | ||||
| -rw-r--r-- | overcloud-source.yaml | 2 | ||||
| -rw-r--r-- | ssl-source.yaml | 1 | ||||
| -rw-r--r-- | swift-source.yaml | 1 |
5 files changed, 7 insertions, 0 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index 9cc92fe1..16363b59 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -34,6 +34,7 @@ Resources: BlockStorageConfig: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: admin-password: {Ref: AdminPassword} keystone: diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index b296083b..4d672f66 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -2,6 +2,7 @@ Resources: NovaComputeConfig: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: nova: compute_driver: { get_input: nova_compute_driver } @@ -52,4 +53,5 @@ Resources: NovaComputePassthrough: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: {get_input: passthrough_config} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index d17042ae..cf1eecda 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -353,6 +353,7 @@ Resources: controllerConfig: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: completion-signal: {get_input: deploy_signal_id} admin-password: @@ -475,6 +476,7 @@ Resources: controllerPassthrough: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: {get_input: passthrough_config} controller0: Type: OS::Nova::Server diff --git a/ssl-source.yaml b/ssl-source.yaml index 26f2f72c..c3edbe75 100644 --- a/ssl-source.yaml +++ b/ssl-source.yaml @@ -14,6 +14,7 @@ Resources: SSLConfig: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: stunnel: cert: diff --git a/swift-source.yaml b/swift-source.yaml index 1a17b770..aee81c26 100644 --- a/swift-source.yaml +++ b/swift-source.yaml @@ -2,6 +2,7 @@ Resources: SwiftConfig: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: swift: devices: { get_input: swift_devices } |