diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-15 14:34:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-15 14:34:38 +0000 |
| commit | f988e0cc6bfe568c29473a4a2e5d93025862ada0 (patch) | |
| tree | d837b9e8b7e50cfa41670ca468c78bf92c773faf | |
| parent | 6976b8f6502394b09fb502666a47c0b2fcbc5304 (diff) | |
| parent | 589b18dafc5f9a79d39bfb0a1d8ecbc0d3d34627 (diff) | |
Merge "Fix Heat condition for RHEL registration yum update"
| -rw-r--r-- | extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml | 7 | ||||
| -rw-r--r-- | releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml | 9 |
2 files changed, 14 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} diff --git a/releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml b/releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml new file mode 100644 index 00000000..e417f5f2 --- /dev/null +++ b/releasenotes/notes/fix-heat-condition-for-rhel-reg-311a3dce76cc0ec1.yaml @@ -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 |