From 83d4e84a47e951e2c13e669c9cf99aad588c0007 Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Wed, 22 Jan 2020 15:16:12 -0330
Subject: [PATCH] Add DeployIdentifier to extra config containers

Certain config containers might need to be replaced and re-run
regardless of whether configuration changes on update and upgrade.
Adding the DeployIdentifier to the env will ensure that they are.

Conflicts:
  deployment/mistral/mistral-api-container-puppet.yaml

Note: this cherry-pick is missing changes to
ovn-metadata-container-puppet.yaml that  were made in the original
patch because the systemd-tripleo-wrappers was backported, making this
particular change unnecessary.

Change-Id: I150212ebac3fed471ffb4e7ed7b6eb6c7af3fad9
Closes-Bug: #1860571
(cherry picked from commit 714e1b5d3120b1babfec01c15bf508cc9241ceb2)
---
 deployment/aodh/aodh-api-container-puppet.yaml            | 8 ++++++++
 deployment/cinder/cinder-api-container-puppet.yaml        | 8 ++++++++
 .../designate/designate-central-container-puppet.yaml     | 8 ++++++++
 deployment/glance/glance-api-container-puppet.yaml        | 7 +++++++
 deployment/gnocchi/gnocchi-api-container-puppet.yaml      | 7 +++++++
 deployment/heat/heat-engine-container-puppet.yaml         | 8 ++++++++
 deployment/ironic/ironic-api-container-puppet.yaml        | 8 ++++++++
 deployment/ironic/ironic-inspector-container-puppet.yaml  | 7 +++++++
 deployment/keystone/keystone-container-puppet.yaml        | 7 +++++++
 deployment/mistral/mistral-api-container-puppet.yaml      | 8 ++++++++
 .../neutron-agents-ib-config-container-puppet.yaml        | 7 +++++++
 deployment/neutron/neutron-api-container-puppet.yaml      | 8 ++++++++
 .../neutron/neutron-mlnx-agent-container-puppet.yaml      | 7 +++++++
 .../neutron/neutron-ovs-agent-container-puppet.yaml       | 7 +++++++
 deployment/nova/nova-api-container-puppet.yaml            | 8 ++++++++
 deployment/nova/nova-conductor-container-puppet.yaml      | 8 ++++++++
 deployment/octavia/octavia-api-container-puppet.yaml      | 8 ++++++++
 deployment/ovn/ovn-controller-container-puppet.yaml       | 8 ++++++++
 deployment/placement/placement-api-container-puppet.yaml  | 8 ++++++++
 deployment/sahara/sahara-api-container-puppet.yaml        | 8 ++++++++
 deployment/zaqar/zaqar-container-puppet.yaml              | 8 ++++++++
 21 files changed, 161 insertions(+)

diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml
index ba3f1286a9..a12d0a6eac 100644
--- a/deployment/aodh/aodh-api-container-puppet.yaml
+++ b/deployment/aodh/aodh-api-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   EnableInternalTLS:
     type: boolean
     default: false
@@ -186,6 +192,8 @@ outputs:
                   - /var/log/containers/aodh:/var/log/aodh
                   - /var/log/containers/httpd/aodh-api:/var/log/httpd
             command: "/usr/bin/bootstrap_host_exec aodh_api su aodh -s /bin/bash -c /usr/bin/aodh-dbsync"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           aodh_api:
             image: *aodh_api_image
diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml
index f36aa37884..8ec640b794 100644
--- a/deployment/cinder/cinder-api-container-puppet.yaml
+++ b/deployment/cinder/cinder-api-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   EnableInternalTLS:
     type: boolean
     default: false
@@ -271,6 +277,8 @@ outputs:
               - '/usr/bin/bootstrap_host_exec'
               - 'cinder_api'
               - "su cinder -s /bin/bash -c 'cinder-manage db sync --bump-versions'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           cinder_api:
             image: *cinder_api_image
diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml
index c1da37c105..8b5421fd2b 100644
--- a/deployment/experimental/designate/designate-central-container-puppet.yaml
+++ b/deployment/experimental/designate/designate-central-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   MonitoringSubscriptionDesignateCentral:
     default: 'overcloud-designate-central'
     type: string
@@ -155,6 +161,8 @@ outputs:
                   - /var/lib/config-data/designate/etc/designate/:/etc/designate/:ro
                   - /var/log/containers/designate:/var/log/designate:z
             command: "/usr/bin/bootstrap_host_exec designate_central su designate -s /bin/bash -c 'designate-manage --config-file /etc/designate/designate.conf database sync'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           designate_central:
             image: *designate_central_image
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index f16e2880b1..2ae1659f0d 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -30,6 +30,12 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   Debug:
     default: false
     description: Set to True to enable debugging on all services.
@@ -531,6 +537,7 @@ outputs:
             environment:
               KOLLA_BOOTSTRAP: true
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
             command: "/usr/bin/bootstrap_host_exec glance_api su glance -s /bin/bash -c '/usr/local/bin/kolla_start'"
         step_4:
           map_merge:
diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
index 63adebae51..0390de3d98 100644
--- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml
+++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   EnableInternalTLS:
     type: boolean
     default: false
@@ -310,6 +316,7 @@ outputs:
                   - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
           gnocchi_api:
             image: *gnocchi_api_image
             start_order: 1
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index 92c4f91c95..cf5d250ea6 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   HeatEngineOptVolumes:
     default: []
     description: list of optional volumes to be mounted
@@ -244,6 +250,8 @@ outputs:
                   - /var/lib/config-data/heat/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/heat/etc/heat/:/etc/heat/:ro
             command: "/usr/bin/bootstrap_host_exec heat_engine su heat -s /bin/bash -c 'heat-manage db_sync'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           heat_engine:
             image: *heat_engine_image
diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml
index fd6f048466..b0fe11b874 100644
--- a/deployment/ironic/ironic-api-container-puppet.yaml
+++ b/deployment/ironic/ironic-api-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   IronicPassword:
     description: The password for the Ironic service and db account, used by the Ironic services
     type: string
@@ -232,6 +238,8 @@ outputs:
                   - /var/log/containers/httpd/ironic-api:/var/log/httpd:z
                   - /var/lib/config-data/ironic_api/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
             command: "/usr/bin/bootstrap_host_exec ironic_api su ironic -s /bin/bash -c 'ironic-dbsync --config-file /etc/ironic/ironic.conf'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           ironic_api:
             start_order: 10
diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml
index 19c30ee014..d554dd8082 100644
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   IPAImageURLs:
     default: []
     description: IPA image URLs, the format should be ["http://path/to/kernel", "http://path/to/ramdisk"]
@@ -391,6 +397,7 @@ outputs:
                   - /var/log/containers/ironic-inspector:/var/log/ironic-inspector:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
             command: "/usr/bin/bootstrap_host_exec ironic_inspector su ironic-inspector -s /bin/bash -c 'ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade'"
           ironic_inspector_get_ipa:
             start_order: 2
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 0bff55b6ca..bf2c0dd0b9 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   AdminPassword:
     description: The password for the keystone admin account, used for monitoring, querying neutron etc.
     type: string
@@ -611,6 +617,7 @@ outputs:
                 - {get_attr: [KeystoneLogging, environment]}
                 - KOLLA_BOOTSTRAP: true
                   KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+                  TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
             command: ['/usr/bin/bootstrap_host_exec', 'keystone', '/usr/local/bin/kolla_start']
           keystone:
             start_order: 2
diff --git a/deployment/mistral/mistral-api-container-puppet.yaml b/deployment/mistral/mistral-api-container-puppet.yaml
index 836d6e3475..2f51b892c9 100644
--- a/deployment/mistral/mistral-api-container-puppet.yaml
+++ b/deployment/mistral/mistral-api-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   MistralWorkers:
     default: 1
     description: The number of workers for the mistral-api.
@@ -180,6 +186,8 @@ outputs:
                   - /var/lib/config-data/mistral/etc/mistral/:/etc/mistral/:ro
                   - /var/log/containers/mistral:/var/log/mistral:z
             command: "/usr/bin/bootstrap_host_exec mistral_api su mistral -s /bin/bash -c 'mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           mistral_api:
             start_order: 15
diff --git a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
index 0ceea67e46..f26ecf0171 100644
--- a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
+++ b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
@@ -33,6 +33,12 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   MultiInterfaceDriverMappings:
     type: comma_delimited_list
     default: ""
@@ -116,6 +122,7 @@ outputs:
                   - ''
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       upgrade_tasks: []
diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml
index aa3abf305b..d583732f15 100644
--- a/deployment/neutron/neutron-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-api-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   EnableInternalTLS:
     type: boolean
     default: false
@@ -451,6 +457,8 @@ outputs:
             # FIXME: we should make config file permissions right
             # and run as neutron user
             #command: "/usr/bin/bootstrap_host_exec neutron_api su neutron -s /bin/bash -c 'neutron-db-manage upgrade heads'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           map_merge:
             - neutron_api:
diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
index 34caff938e..83886b28cf 100644
--- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   NeutronPhysicalDevMappings:
     description: >
       List of <physical_network>:<physical device>
@@ -173,6 +179,7 @@ outputs:
                   - ''
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           neutron_mlnx_agent:
             start_order: 10
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 948e47cbc9..5a894b9d27 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -45,6 +45,12 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   DockerPuppetMountHostPuppet:
     type: boolean
     default: true
@@ -304,6 +310,7 @@ outputs:
                       - ''
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           neutron_ovs_agent:
             start_order: 10
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 6688a20392..5b99fdd469 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   EnableInternalTLS:
     type: boolean
     default: false
@@ -343,6 +349,8 @@ outputs:
                   - /var/lib/config-data/nova/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
             command: "/usr/bin/bootstrap_host_exec nova_api su nova -s /bin/bash -c '/usr/bin/nova-manage api_db sync'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
           nova_api_map_cell0:
             start_order: 1 # Runs before nova-conductor dbsync
             image: *nova_api_image
diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml
index 2294412c6e..d4967946e0 100644
--- a/deployment/nova/nova-conductor-container-puppet.yaml
+++ b/deployment/nova/nova-conductor-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   NovaWorkers:
     default: 0
     description: Number of workers for Nova services.
@@ -172,6 +178,8 @@ outputs:
                   - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
             user: root
             command: "/usr/bin/bootstrap_host_exec nova_conductor su nova -s /bin/bash -c '/usr/bin/nova-manage db sync'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           nova_conductor:
             image: *nova_conductor_image
diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml
index 88fc67c567..2415053397 100644
--- a/deployment/octavia/octavia-api-container-puppet.yaml
+++ b/deployment/octavia/octavia-api-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   EnableInternalTLS:
     type: boolean
     default: false
@@ -281,6 +287,8 @@ outputs:
                   - /var/log/containers/octavia:/var/log/octavia:z
                   - /var/log/containers/httpd/octavia-api:/var/log/httpd:z
             command: "/usr/bin/bootstrap_host_exec octavia_api su octavia -s /bin/bash -c '/usr/bin/octavia-db-manage upgrade head'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           map_merge:
             - octavia_api:
diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml
index 08cf4233be..86660464e1 100644
--- a/deployment/ovn/ovn-controller-container-puppet.yaml
+++ b/deployment/ovn/ovn-controller-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   OVNSouthboundServerPort:
     description: Port of the Southbound DB Server
     type: number
@@ -230,6 +236,8 @@ outputs:
                  -
                    - /lib/modules:/lib/modules:ro
                    - /run/openvswitch:/run/openvswitch:shared,z
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
           ovn_controller:
             start_order: 1
             image: *ovn_controller_image
diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml
index 958e21d307..6f06c54c91 100644
--- a/deployment/placement/placement-api-container-puppet.yaml
+++ b/deployment/placement/placement-api-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   EnableInternalTLS:
     type: boolean
     default: false
@@ -250,6 +256,8 @@ outputs:
                   - /var/lib/config-data/placement/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro
                   - /var/lib/config-data/placement/etc/placement/:/etc/placement/:ro
             command: "/usr/bin/bootstrap_host_exec placement su placement -s /bin/bash -c '/usr/bin/placement-manage db sync'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           placement_api:
             start_order: 1
diff --git a/deployment/sahara/sahara-api-container-puppet.yaml b/deployment/sahara/sahara-api-container-puppet.yaml
index c6ecec912d..c3e889f906 100644
--- a/deployment/sahara/sahara-api-container-puppet.yaml
+++ b/deployment/sahara/sahara-api-container-puppet.yaml
@@ -41,6 +41,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   SaharaPassword:
     description: The password for the sahara service account, used by sahara-api.
     type: string
@@ -172,6 +178,8 @@ outputs:
                   - /var/lib/sahara:/var/lib/sahara
                   - /var/log/containers/sahara:/var/log/sahara
             command: "/usr/bin/bootstrap_host_exec sahara_api su sahara -s /bin/bash -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head'"
+            environment:
+              TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
         step_4:
           sahara_api:
             image: *sahara_api_image
diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/zaqar/zaqar-container-puppet.yaml
index 78733a1c2f..fb05354422 100644
--- a/deployment/zaqar/zaqar-container-puppet.yaml
+++ b/deployment/zaqar/zaqar-container-puppet.yaml
@@ -36,6 +36,12 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  DeployIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting this to a unique value will re-run any deployment tasks which
+      perform configuration on a Heat stack-update.
   Debug:
     type: boolean
     description: Set to True to enable debugging on all services.
@@ -294,6 +300,8 @@ outputs:
                         - /var/log/containers/zaqar:/var/log/zaqar
                         - /var/log/containers/httpd/zaqar:/var/log/httpd
                   command: "/usr/bin/bootstrap_host_exec zaqar_api su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'"
+                  environment:
+                    TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier}
             - {}
           - step_4:
               zaqar: