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

diff --git a/block-storage.yaml b/block-storage.yaml
index ce60ce2..73240c8 100644 (file)
--- 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 02d8e00..91a3cfe 100644 (file)
--- 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 3aafb6d..fe3208d 100644 (file)
--- 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 26f2f72..c3edbe7 100644 (file)
--- 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 1a17b77..aee81c2 100644 (file)
--- 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 }