diff options
| author |   Steve Baker <sbaker@redhat.com> | 2014-05-02 16:02:35 +1200 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2014-05-02 16:02:35 +1200 |
| commit | e9c3d6f06b5577be4e2f91bf8f3ddbb06d913748 (patch) | |
| tree | b1f1b29821b74eb05e0e6ac8c39118e5c2091c0b | |
| parent | b8d42f54c6ca193d6b24162d01f3e0a56bd8c6e6 (diff) | |
Specify group os-apply-config for config resources
This will indicate to os-collect-config that this config
resource represents os-apply-config configuration data,
so it can only write out top-level config files for
os-apply-config data (or Heat::Ungrouped for backwards
compatibility).
Change-Id: I3552fdd6df8106ab83cfd17d5f4b137cf33fbc36
Related-Bug: #1299109
| -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 ce60ce26..73240c8d 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 02d8e002..91a3cfe6 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 } @@ -48,4 +49,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 3aafb6dd..fe3208d7 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -303,6 +303,7 @@ Resources: controllerConfig: Type: OS::Heat::StructuredConfig Properties: + group: os-apply-config config: completion-signal: {get_input: deploy_signal_id} admin-password: @@ -409,6 +410,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 } |