Merge "Fix Heat condition for RHEL registration yum update" into stable/newton

extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml

@@ -60,6 +60,12 @@ parameters:
       When enabled, the system will perform a yum update after performing the
       RHEL Registration process.
 
+conditions:
+  update_requested:
+    equals:
+      - {get_param: UpdateOnRHELRegistration}
+      - true
+
 resources:
 
   RHELRegistration:
@@ -171,8 +177,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}

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