Merge "rerun *_init_bundles all the time"

docker/services/pacemaker/cinder-backup.yaml

@@ -57,6 +57,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -218,6 +224,13 @@ outputs:
                 - {get_attr: [ContainersCommon, docker_puppet_apply_volumes]}
                 - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

docker/services/pacemaker/cinder-volume.yaml

@@ -54,6 +54,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -212,6 +218,13 @@ outputs:
                 - {get_attr: [ContainersCommon, docker_puppet_apply_volumes]}
                 - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

docker/services/pacemaker/database/redis.yaml

@@ -52,6 +52,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -250,6 +256,13 @@ outputs:
                     - {get_attr: [ContainersCommon, docker_puppet_apply_volumes]}
                     - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                       - /dev/shm:/dev/shm:rw
+                environment:
+                  # NOTE: this should force this container to re-run on each
+                  # update (scale-out, etc.)
+                  - list_join:
+                      - ''
+                      - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                        - {get_param: DeployIdentifier}
             - if:
                 - internal_tls_enabled
                 - redis_tls_proxy:

docker/services/pacemaker/haproxy.yaml

@@ -81,6 +81,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -272,6 +278,13 @@ outputs:
                   - /usr/libexec/initscripts/legacy-actions:/usr/libexec/initscripts/legacy-actions:ro
                   - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       host_prep_tasks:
         - {get_attr: [HAProxyBase, role_data, host_prep_tasks]}
         - name: create persistent directories

docker/services/pacemaker/manila-share.yaml

@@ -45,6 +45,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -188,6 +194,13 @@ outputs:
                 - {get_attr: [ContainersCommon, docker_puppet_apply_volumes]}
                 - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

docker/services/pacemaker/notify-rabbitmq.yaml

@@ -49,6 +49,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -235,6 +241,13 @@ outputs:
                 - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
                   - /bin/true:/bin/epmd
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

docker/services/pacemaker/ovn-dbs.yaml

@@ -53,6 +53,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -154,6 +160,13 @@ outputs:
                 - {get_attr: [ContainersCommon, docker_puppet_apply_volumes]}
                 - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

docker/services/pacemaker/rabbitmq.yaml

@@ -49,6 +49,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -234,6 +240,13 @@ outputs:
                 - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
                   - /bin/true:/bin/epmd
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       host_prep_tasks:
         - name: create persistent directories
           file:

docker/services/pacemaker/rpc-rabbitmq.yaml

@@ -49,6 +49,12 @@ parameters:
     description: Time in seconds to wait for a pcmk resource to restart when
                  a config change is detected and the resource is being restarted
     type: number
+  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.
 
 conditions:
   puppet_debug_enabled: {get_param: ConfigDebug}
@@ -235,6 +241,13 @@ outputs:
                 - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
                   - /dev/shm:/dev/shm:rw
                   - /bin/true:/bin/epmd
+            environment:
+              # NOTE: this should force this container to re-run on each
+              # update (scale-out, etc.)
+              - list_join:
+                  - ''
+                  - - 'TRIPLEO_DEPLOY_IDENTIFIER='
+                    - {get_param: DeployIdentifier}
       metadata_settings:
         get_attr: [RabbitmqBase, role_data, metadata_settings]
       host_prep_tasks: