From 6e49e15e650a4aa08134bd40d0c09b5d6296b97a Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 18 Jun 2015 09:13:58 -0400 Subject: [PATCH] Use SoftwareDeployments for consistency in extraconfig Currently we've got a mix of SoftwareConfig resource with StructuredDeployments resources - while this will work it's inconsistent and normally using the corresponding SoftwareDeployments resouce is encourgaged instead. Change-Id: I308d62d4ff491c073e3e8650fd4c2c65bf96d14a --- extraconfig/post_deploy/example.yaml | 2 +- .../post_deploy/rhel-registration/rhel-registration.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extraconfig/post_deploy/example.yaml b/extraconfig/post_deploy/example.yaml index 6b816d40d2..1d3dca2526 100644 --- a/extraconfig/post_deploy/example.yaml +++ b/extraconfig/post_deploy/example.yaml @@ -20,7 +20,7 @@ resources: echo "extra" > /root/extra ExtraDeployments: - type: OS::Heat::StructuredDeployments + type: OS::Heat::SoftwareDeployments properties: servers: {get_param: servers} config: {get_resource: ExtraConfig} diff --git a/extraconfig/post_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/post_deploy/rhel-registration/rhel-registration.yaml index cbf8f8b59f..bf6c88cd45 100644 --- a/extraconfig/post_deploy/rhel-registration/rhel-registration.yaml +++ b/extraconfig/post_deploy/rhel-registration/rhel-registration.yaml @@ -71,7 +71,7 @@ resources: config: {get_file: scripts/rhel-registration} RHELRegistrationDeployment: - type: OS::Heat::StructuredDeployments + type: OS::Heat::SoftwareDeployments properties: servers: {get_param: servers} config: {get_resource: RHELRegistration} @@ -104,7 +104,7 @@ resources: - name: REG_METHOD RHELUnregistrationDeployment: - type: OS::Heat::StructuredDeployments + type: OS::Heat::SoftwareDeployments properties: servers: {get_param: servers} config: {get_resource: RHELUnregistration}