diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-22 10:27:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-22 10:27:39 +0000 |
| commit | 12263b5aa19f215d0952714c40792fcb89622017 (patch) | |
| tree | cef7f666b9ab9577baa9a96f4c2a7cb9f8efbfe8 | |
| parent | 0072ab0903bd59567c75cd9500f94623e1c18581 (diff) | |
| parent | 6e49e15e650a4aa08134bd40d0c09b5d6296b97a (diff) | |
Merge "Use SoftwareDeployments for consistency in extraconfig"
| -rw-r--r-- | extraconfig/post_deploy/example.yaml | 2 | ||||
| -rw-r--r-- | extraconfig/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 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} |