From ebb5dde52f2c40f59c6a2cf9197a6d08f9898d28 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Wed, 29 May 2019 10:08:08 +0530
Subject: [PATCH] [stable queens/pike] Use server_not_blacklisted condition

If the 'actions' is set to [] for UpdateDeployment, doing get_attr
would throw an error, as the deployment are not created in heat and
resource_id would be None.  Though this should be fixed in heat,
it would be good to get attributes from UpdateDeployment conditionally.

This minor update code has been removed since stable/rocky with
change I6c5eafe76eb53bc38d100a9ba132dd8fe6dd2d5f.

Change-Id: I86fc82e604fbdee2881c4ef0ad6602da412a7ee6
Closes-Bug: #1830837
(cherry picked from commit 2c4004d7ace1ee540d9770d5733e050a1a62fa34)
---
 puppet/role.role.j2.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index b431880ea8..5f28850af7 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -496,7 +496,11 @@ resources:
       config: {get_resource: {{server_resource_name}}Config}
       server: {get_resource: {{server_resource_name}}}
       input_values:
-        enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
+        enable_package_upgrade:
+          if:
+            - server_not_blacklisted
+            - {get_attr: [UpdateDeployment, update_managed_packages]}
+            - false
       actions:
         if:
           - server_not_blacklisted