openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix Heat condition for RHEL registration yum update"

Browse Source
This commit is contained in:
Jenkins 2017-08-15 14:34:38 +00:00 committed by Gerrit Code Review
commit f988e0cc6b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
View File

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

9
releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml Normal file
View File

@ -0,0 +1,9 @@
---
fixes:
- |
Fix Heat condition for RHEL registration yum update
There were 2 problems with this condition making the
rhel-registration.yaml template broken: "conditions" should be "condition"
and the condition should refer to just a condition name defined in the
"conditions:" section of the template. See
https://bugs.launchpad.net/tripleo/+bug/1709916