From 589b18dafc5f9a79d39bfb0a1d8ecbc0d3d34627 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Thu, 10 Aug 2017 13:42:31 -0400
Subject: 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
---
 extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'extraconfig')

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}
-- 
cgit 1.2.3-korg