summaryrefslogtreecommitdiffstats
path: root/extraconfig
diff options
context:
space:
mode:
authorJames Slagle <jslagle@redhat.com>2017-08-10 13:42:31 -0400
committerJames Slagle <jslagle@redhat.com>2017-08-14 08:47:45 -0400
commit589b18dafc5f9a79d39bfb0a1d8ecbc0d3d34627 (patch)
tree914a9e85599b3ac6fd8a82e36f6554c7ca1bc1b0 /extraconfig
parenta454ff5acb361547c944c3a65176506b6566d3a8 (diff)
Fix Heat condition for RHEL registration yum update
There were 2 problems with this condition making the rhel-registration.yal template broken: "conditions" should be "condition" The condition should refer to just a condition name defined in the "conditions:" section of the template. Change-Id: I14d5c72cf86423808e81f1d8406098d5fd635e66 Closes-Bug: #1709916
Diffstat (limited to 'extraconfig')
-rw-r--r--extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml7
1 files changed, 5 insertions, 2 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
index fb0d1699..8b2b2308 100644
--- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
+++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
@@ -72,6 +72,10 @@ conditions:
equals:
- {get_param: deployment_actions}
- []
+ update_requested:
+ equals:
+ - {get_param: UpdateOnRHELRegistration}
+ - true
resources:
@@ -180,8 +184,7 @@ resources:
UpdateDeploymentAfterRHELRegistration:
type: OS::Heat::SoftwareDeployment
depends_on: RHELRegistrationDeployment
- conditions:
- update_requested: {get_param: UpdateOnRHELRegistration}
+ condition: update_requested
properties:
name: UpdateDeploymentAfterRHELRegistration
config: {get_resource: YumUpdateConfigurationAfterRHELRegistration}