From 63f926d8a0b5c7b6e952c7023fbacf687bb03645 Mon Sep 17 00:00:00 2001
From: "Brad P. Crochet" <brad@redhat.com>
Date: Fri, 14 Oct 2016 09:38:19 -0400
Subject: [PATCH] Refresh DeployIdentifier as well on update

The package update was not refreshing the DeployIdentifier, so puppet
was never actually running. This adds the DeployIdentifier to the
heat update call.

Change-Id: I102c935e618e822c41e1201cdbb8e243ff8421af
Depends-On: I1be83f88be1959885c980ab4f428477d412751f7
Closes-Bug: #1522943
---
 tripleo_common/tests/test_update.py | 1 +
 tripleo_common/update.py            | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tripleo_common/tests/test_update.py b/tripleo_common/tests/test_update.py
index c803b3407..d92ab51c1 100644
--- a/tripleo_common/tests/test_update.py
+++ b/tripleo_common/tests/test_update.py
@@ -62,6 +62,7 @@ class UpdateManagerTest(base.TestCase):
                     }
                 },
                 'parameter_defaults': {
+                    'DeployIdentifier': 123,
                     'UpdateIdentifier': 123,
                     'StackAction': 'UPDATE'
                 },
diff --git a/tripleo_common/update.py b/tripleo_common/update.py
index 3e9ef06e3..1a730e7e4 100644
--- a/tripleo_common/update.py
+++ b/tripleo_common/update.py
@@ -63,7 +63,11 @@ class PackageUpdateManager(_stack_update.StackUpdateManager):
         # time rounded to seconds
         timestamp = int(time.time())
 
-        stack_params = {'UpdateIdentifier': timestamp, 'StackAction': 'UPDATE'}
+        stack_params = {
+            'DeployIdentifier': timestamp,
+            'UpdateIdentifier': timestamp,
+            'StackAction': 'UPDATE'
+        }
         template_utils.deep_update(env, {'parameter_defaults': stack_params})
 
         self.stack_fields['environment'] = env