From: Steven Hardy <shardy@redhat.com>
Date: Thu, 18 Jun 2015 13:13:58 +0000 (-0400)
Subject: Use SoftwareDeployments for consistency in extraconfig
X-Git-Tag: opnfv-6.0.0~2474^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6e49e15e650a4aa08134bd40d0c09b5d6296b97a;p=apex-tripleo-heat-templates.git

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
---

diff --git a/extraconfig/post_deploy/example.yaml b/extraconfig/post_deploy/example.yaml
index 6b816d40..1d3dca25 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 cbf8f8b5..bf6c88cd 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}