Browse Source

Merge "HA: fix <service>_restart_bundle with minor update workflow" into stable/stein

tags/10.6.1^0
Zuul 1 week ago
parent
commit
999c846764

+ 40
- 0
container_config_scripts/pacemaker_restart_bundle.sh View File

@@ -0,0 +1,40 @@
1
+#!/bin/bash
2
+
3
+set -u
4
+
5
+# ./pacemaker_restart_bundle.sh galera-bundle galera
6
+RESOURCE=$1
7
+TRIPLEO_SERVICE=$2
8
+
9
+# try to restart only if resource has been created already
10
+if /usr/sbin/pcs resource show $RESOURCE; then
11
+    if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ]; then
12
+        # During a stack update, this script is called in parallel on
13
+        # every node the resource runs on, after the service's configs
14
+        # have been updated on all nodes. So we need to run pcs only
15
+        # once (e.g. on the service's boostrap node).
16
+        echo "$(date -u): Restarting ${RESOURCE} globally"
17
+        /usr/bin/bootstrap_host_exec $TRIPLEO_SERVICE /sbin/pcs resource restart --wait=__PCMKTIMEOUT__ $RESOURCE
18
+    else
19
+        # During a minor update workflow however, a host gets fully
20
+        # updated before updating the next one. So unlike stack
21
+        # update, at the time this script is called, the service's
22
+        # configs aren't updated on all nodes yet. So only restart the
23
+        # resource locally, where it's guaranteed that the config is
24
+        # up to date.
25
+        HOST=$(facter hostname)
26
+        # XPath rationale: as long as there is a bundle running
27
+        # locally and it is managed by pacemaker, no matter the state
28
+        # of any inner pcmk_remote or ocf resource, we should restart
29
+        # it to give it a chance to read the new config.
30
+        # XPath rationale 2: if the resource is being stopped, the
31
+        # attribute "target_role" will be present in the output of
32
+        # crm_mon. Do not restart the resource if that is the case.
33
+        if crm_mon -r --as-xml | xmllint --format --xpath "//bundle[@id='${RESOURCE}']/replica/resource[@managed='true' and (not(boolean(@target_role)) or (boolean(@target_role) and @target_role!='Stopped'))]/node[@name='${HOST}']/../.." - &>/dev/null; then
34
+            echo "$(date -u): Restarting ${RESOURCE} locally on '${HOST}'"
35
+            /sbin/pcs resource restart --wait=__PCMKTIMEOUT__ $RESOURCE "${HOST}"
36
+        else
37
+            echo "$(date -u): Resource ${RESOURCE} currently not running on '${HOST}', no restart needed"
38
+        fi
39
+    fi
40
+fi

+ 3
- 20
deployment/cinder/cinder-backup-pacemaker-puppet.yaml View File

@@ -52,11 +52,6 @@ parameters:
52 52
     default: false
53 53
     description: Whether to run config management (e.g. Puppet) in debug mode.
54 54
     type: boolean
55
-  PcmkConfigRestartTimeout:
56
-    default: 600
57
-    description: Time in seconds to wait for a pcmk resource to restart when
58
-                 a config change is detected and the resource is being restarted
59
-    type: number
60 55
   ContainerCli:
61 56
     type: string
62 57
     default: 'podman'
@@ -187,24 +182,12 @@ outputs:
187 182
             user: root
188 183
             environment:
189 184
               - TRIPLEO_MINOR_UPDATE
190
-            command:
191
-              - '/usr/bin/bootstrap_host_exec'
192
-              - 'cinder_backup'
193
-              - str_replace:
194
-                  template:
195
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show openstack-cinder-backup; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-cinder-backup; echo "openstack-cinder-backup restart invoked"; fi'
196
-                  params:
197
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
185
+            command: /pacemaker_restart_bundle.sh openstack-cinder-backup cinder_backup
198 186
             image: {get_param: DockerCinderBackupImage}
199 187
             volumes:
200 188
               list_concat:
201
-                - {get_attr: [ContainersCommon, volumes]}
202
-                -
203
-                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
204
-                - if:
205
-                  - docker_enabled
206
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
207
-                  - null
189
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
190
+                - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
208 191
           cinder_backup_init_bundle:
209 192
             start_order: 1
210 193
             detach: false

+ 3
- 20
deployment/cinder/cinder-volume-pacemaker-puppet.yaml View File

@@ -40,11 +40,6 @@ parameters:
40 40
     default: false
41 41
     description: Whether to run config management (e.g. Puppet) in debug mode.
42 42
     type: boolean
43
-  PcmkConfigRestartTimeout:
44
-    default: 600
45
-    description: Time in seconds to wait for a pcmk resource to restart when
46
-                 a config change is detected and the resource is being restarted
47
-    type: number
48 43
   ContainerCli:
49 44
     type: string
50 45
     default: 'podman'
@@ -172,24 +167,12 @@ outputs:
172 167
             user: root
173 168
             environment:
174 169
               - TRIPLEO_MINOR_UPDATE
175
-            command:
176
-              - '/usr/bin/bootstrap_host_exec'
177
-              - 'cinder_volume'
178
-              - str_replace:
179
-                  template:
180
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] &&  /usr/sbin/pcs resource show openstack-cinder-volume; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-cinder-volume; echo "openstack-cinder-volume restart invoked"; fi'
181
-                  params:
182
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
170
+            command: /pacemaker_restart_bundle.sh openstack-cinder-volume cinder_volume
183 171
             image: {get_param: DockerCinderVolumeImage}
184 172
             volumes:
185 173
               list_concat:
186
-                - {get_attr: [ContainersCommon, volumes]}
187
-                -
188
-                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
189
-                - if:
190
-                  - docker_enabled
191
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
192
-                  - null
174
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
175
+                - - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
193 176
           cinder_volume_init_bundle:
194 177
             start_order: 1
195 178
             detach: false

+ 24
- 0
deployment/containers-common.yaml View File

@@ -47,6 +47,12 @@ parameters:
47 47
     description: The network port for messaging backend
48 48
     type: number
49 49
 
50
+  PcmkConfigRestartTimeout:
51
+    default: 600
52
+    description: Time in seconds to wait for a pacemaker resource to restart when
53
+                 a config change is detected and the resource is being restarted
54
+    type: number
55
+
50 56
 conditions:
51 57
 
52 58
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@@ -90,6 +96,13 @@ outputs:
90 96
       pyshim.sh:
91 97
         mode: "0755"
92 98
         content: { get_file: ../container_config_scripts/pyshim.sh }
99
+      pacemaker_restart_bundle.sh:
100
+        mode: "0755"
101
+        content:
102
+          str_replace:
103
+            template: { get_file: ../container_config_scripts/pacemaker_restart_bundle.sh }
104
+            params:
105
+              __PCMKTIMEOUT__: {get_param: PcmkConfigRestartTimeout}
93 106
 
94 107
   volumes_base:
95 108
     description: Base volume list
@@ -123,6 +136,17 @@ outputs:
123 136
           # required for bootstrap_host_exec
124 137
           - /etc/puppet:/etc/puppet:ro
125 138
 
139
+  pacemaker_restart_volumes:
140
+    description: Common volumes for the pacemaker restart containers.
141
+    value:
142
+      list_concat:
143
+        - *volumes_base
144
+        - - /var/lib/container-config-scripts/pacemaker_restart_bundle.sh:/pacemaker_restart_bundle.sh:ro
145
+          - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
146
+          - /dev/shm:/dev/shm:rw
147
+          # required for bootstrap_host_exec, facter
148
+          - /etc/puppet:/etc/puppet:ro
149
+
126 150
   container_puppet_apply_volumes:
127 151
     description: Common volumes needed to run the container_puppet_apply.sh from container_config_scripts
128 152
     value:

+ 3
- 20
deployment/database/mysql-pacemaker-puppet.yaml View File

@@ -67,11 +67,6 @@ parameters:
67 67
     description: >
68 68
       Setting this to a unique value will re-run any deployment tasks which
69 69
       perform configuration on a Heat stack-update.
70
-  PcmkConfigRestartTimeout:
71
-    default: 600
72
-    description: Time in seconds to wait for a pcmk resource to restart when
73
-                 a config change is detected and the resource is being restarted
74
-    type: number
75 70
   ContainerCli:
76 71
     type: string
77 72
     default: 'podman'
@@ -271,24 +266,12 @@ outputs:
271 266
             user: root
272 267
             environment:
273 268
               - TRIPLEO_MINOR_UPDATE
274
-            command:
275
-              - '/usr/bin/bootstrap_host_exec'
276
-              - 'mysql'
277
-              - str_replace:
278
-                  template:
279
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show galera-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT galera-bundle; echo "galera-bundle restart invoked"; fi'
280
-                  params:
281
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
269
+            command: /pacemaker_restart_bundle.sh galera-bundle mysql
282 270
             image: {get_param: DockerMysqlImage}
283 271
             volumes:
284 272
               list_concat:
285
-                - {get_attr: [ContainersCommon, volumes]}
286
-                -
287
-                  - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro
288
-                - if:
289
-                  - docker_enabled
290
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
291
-                  - null
273
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
274
+                - - /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro
292 275
           mysql_init_bundle:
293 276
             start_order: 1
294 277
             detach: false

+ 3
- 20
deployment/database/redis-pacemaker-puppet.yaml View File

@@ -47,11 +47,6 @@ parameters:
47 47
     default: false
48 48
     description: Enable IPv6 in Redis
49 49
     type: boolean
50
-  PcmkConfigRestartTimeout:
51
-    default: 600
52
-    description: Time in seconds to wait for a pcmk resource to restart when
53
-                 a config change is detected and the resource is being restarted
54
-    type: number
55 50
   ContainerCli:
56 51
     type: string
57 52
     default: 'podman'
@@ -219,24 +214,12 @@ outputs:
219 214
                 user: root
220 215
                 environment:
221 216
                   - TRIPLEO_MINOR_UPDATE
222
-                command:
223
-                  - '/usr/bin/bootstrap_host_exec'
224
-                  - 'redis'
225
-                  - str_replace:
226
-                      template:
227
-                        'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show redis-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT redis-bundle; echo "redis-bundle restart invoked"; fi'
228
-                      params:
229
-                        PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
217
+                command: /pacemaker_restart_bundle.sh redis-bundle redis
230 218
                 image: {get_param: DockerRedisConfigImage}
231 219
                 volumes:
232 220
                   list_concat:
233
-                    - {get_attr: [ContainersCommon, volumes]}
234
-                    -
235
-                      - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro
236
-                    - if:
237
-                      - docker_enabled
238
-                      - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
239
-                      - null
221
+                    - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
222
+                    - - /var/lib/config-data/puppet-generated/redis/:/var/lib/kolla/config_files/src:ro
240 223
             - redis_init_bundle:
241 224
                 start_order: 2
242 225
                 detach: false

+ 3
- 20
deployment/haproxy/haproxy-pacemaker-puppet.yaml View File

@@ -82,11 +82,6 @@ parameters:
82 82
     default: false
83 83
     description: Whether to run config management (e.g. Puppet) in debug mode.
84 84
     type: boolean
85
-  PcmkConfigRestartTimeout:
86
-    default: 600
87
-    description: Time in seconds to wait for a pcmk resource to restart when
88
-                 a config change is detected and the resource is being restarted
89
-    type: number
90 85
   ContainerCli:
91 86
     type: string
92 87
     default: 'podman'
@@ -238,24 +233,12 @@ outputs:
238 233
             config_volume: haproxy
239 234
             environment:
240 235
               - TRIPLEO_MINOR_UPDATE
241
-            command:
242
-              - '/usr/bin/bootstrap_host_exec'
243
-              - 'haproxy'
244
-              - str_replace:
245
-                  template:
246
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show haproxy-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT haproxy-bundle; echo "haproxy-bundle restart invoked"; fi'
247
-                  params:
248
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
236
+            command: /pacemaker_restart_bundle.sh haproxy-bundle haproxy
249 237
             image: {get_param: DockerHAProxyImage}
250 238
             volumes:
251 239
               list_concat:
252
-                - {get_attr: [ContainersCommon, volumes]}
253
-                -
254
-                  - /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro
255
-                - if:
256
-                  - docker_enabled
257
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
258
-                  - null
240
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
241
+                - - /var/lib/config-data/puppet-generated/haproxy/:/var/lib/kolla/config_files/src:ro
259 242
           haproxy_init_bundle:
260 243
             start_order: 3
261 244
             detach: false

+ 3
- 20
deployment/manila/manila-share-pacemaker-puppet.yaml View File

@@ -40,11 +40,6 @@ parameters:
40 40
     default: false
41 41
     description: Whether to run config management (e.g. Puppet) in debug mode.
42 42
     type: boolean
43
-  PcmkConfigRestartTimeout:
44
-    default: 600
45
-    description: Time in seconds to wait for a pcmk resource to restart when
46
-                 a config change is detected and the resource is being restarted
47
-    type: number
48 43
   ContainerCli:
49 44
     type: string
50 45
     default: 'podman'
@@ -153,24 +148,12 @@ outputs:
153 148
             user: root
154 149
             environment:
155 150
               - TRIPLEO_MINOR_UPDATE
156
-            command:
157
-              - '/usr/bin/bootstrap_host_exec'
158
-              - 'manila_share'
159
-              - str_replace:
160
-                  template:
161
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show openstack-manila-share; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-manila-share; echo "openstack-manila-share restart invoked"; fi'
162
-                  params:
163
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
151
+            command: /pacemaker_restart_bundle.sh openstack-manila-share manila_share
164 152
             image: {get_param: DockerManilaShareImage}
165 153
             volumes:
166 154
               list_concat:
167
-                - {get_attr: [ContainersCommon, volumes]}
168
-                -
169
-                  - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
170
-                - if:
171
-                  - docker_enabled
172
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
173
-                  - null
155
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
156
+                - - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro
174 157
           manila_share_init_bundle:
175 158
             start_order: 1
176 159
             detach: false

+ 2
- 20
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml View File

@@ -48,11 +48,6 @@ parameters:
48 48
     default: false
49 49
     description: Whether to run config management (e.g. Puppet) in debug mode.
50 50
     type: boolean
51
-  PcmkConfigRestartTimeout:
52
-    default: 600
53
-    description: Time in seconds to wait for a pcmk resource to restart when
54
-                 a config change is detected and the resource is being restarted
55
-    type: number
56 51
   ContainerCli:
57 52
     type: string
58 53
     default: 'podman'
@@ -146,22 +141,9 @@ outputs:
146 141
             user: root
147 142
             environment:
148 143
               - TRIPLEO_MINOR_UPDATE
149
-            command:
150
-              - '/usr/bin/bootstrap_host_exec'
151
-              - 'ovn_dbs'
152
-              - str_replace:
153
-                  template:
154
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show ovn-dbs-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT ovn-dbs-bundle; echo "ovn-dbs-bundle restart invoked"; fi'
155
-                  params:
156
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
144
+            command: /pacemaker_restart_bundle.sh ovn-dbs-bundle ovn_dbs
157 145
             image: {get_param: DockerOvnDbsConfigImage}
158
-            volumes:
159
-              list_concat:
160
-                - {get_attr: [ContainersCommon, volumes]}
161
-                - if:
162
-                  - docker_enabled
163
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
164
-                  - null
146
+            volumes: {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
165 147
           ovn_dbs_init_bundle:
166 148
             start_order: 1
167 149
             detach: false

+ 3
- 20
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml View File

@@ -44,11 +44,6 @@ parameters:
44 44
     default: false
45 45
     description: Whether to run config management (e.g. Puppet) in debug mode.
46 46
     type: boolean
47
-  PcmkConfigRestartTimeout:
48
-    default: 600
49
-    description: Time in seconds to wait for a pcmk resource to restart when
50
-                 a config change is detected and the resource is being restarted
51
-    type: number
52 47
   ContainerCli:
53 48
     type: string
54 49
     default: 'podman'
@@ -194,24 +189,12 @@ outputs:
194 189
             user: root
195 190
             environment:
196 191
               - TRIPLEO_MINOR_UPDATE
197
-            command:
198
-              - '/usr/bin/bootstrap_host_exec'
199
-              - 'oslo_messaging_notify'
200
-              - str_replace:
201
-                  template:
202
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show rabbitmq-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT rabbitmq-bundle; echo "rabbitmq-bundle restart invoked"; fi'
203
-                  params:
204
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
192
+            command: /pacemaker_restart_bundle.sh rabbitmq-bundle oslo_messaging_notify
205 193
             image: {get_param: DockerRabbitmqImage}
206 194
             volumes:
207 195
               list_concat:
208
-                - {get_attr: [ContainersCommon, volumes]}
209
-                -
210
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
211
-                - if:
212
-                  - docker_enabled
213
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
214
-                  - null
196
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
197
+                - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
215 198
           rabbitmq_init_bundle:
216 199
             start_order: 1
217 200
             detach: false

+ 3
- 20
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml View File

@@ -44,11 +44,6 @@ parameters:
44 44
     default: false
45 45
     description: Whether to run config management (e.g. Puppet) in debug mode.
46 46
     type: boolean
47
-  PcmkConfigRestartTimeout:
48
-    default: 600
49
-    description: Time in seconds to wait for a pcmk resource to restart when
50
-                 a config change is detected and the resource is being restarted
51
-    type: number
52 47
   ContainerCli:
53 48
     type: string
54 49
     default: 'podman'
@@ -194,24 +189,12 @@ outputs:
194 189
             user: root
195 190
             environment:
196 191
               - TRIPLEO_MINOR_UPDATE
197
-            command:
198
-              - '/usr/bin/bootstrap_host_exec'
199
-              - 'rabbitmq'
200
-              - str_replace:
201
-                  template:
202
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show rabbitmq-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT rabbitmq-bundle; echo "rabbitmq-bundle restart invoked"; fi'
203
-                  params:
204
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
192
+            command: /pacemaker_restart_bundle.sh rabbitmq-bundle rabbitmq
205 193
             image: {get_param: DockerRabbitmqImage}
206 194
             volumes:
207 195
               list_concat:
208
-                - {get_attr: [ContainersCommon, volumes]}
209
-                -
210
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
211
-                - if:
212
-                  - docker_enabled
213
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
214
-                  - null
196
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
197
+                - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
215 198
           rabbitmq_init_bundle:
216 199
             start_order: 1
217 200
             detach: false

+ 3
- 20
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml View File

@@ -44,11 +44,6 @@ parameters:
44 44
     default: false
45 45
     description: Whether to run config management (e.g. Puppet) in debug mode.
46 46
     type: boolean
47
-  PcmkConfigRestartTimeout:
48
-    default: 600
49
-    description: Time in seconds to wait for a pcmk resource to restart when
50
-                 a config change is detected and the resource is being restarted
51
-    type: number
52 47
   ContainerCli:
53 48
     type: string
54 49
     default: 'podman'
@@ -194,24 +189,12 @@ outputs:
194 189
             user: root
195 190
             environment:
196 191
               - TRIPLEO_MINOR_UPDATE
197
-            command:
198
-              - '/usr/bin/bootstrap_host_exec'
199
-              - 'oslo_messaging_rpc'
200
-              - str_replace:
201
-                  template:
202
-                    'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show rabbitmq-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT rabbitmq-bundle; echo "rabbitmq-bundle restart invoked"; fi'
203
-                  params:
204
-                    PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
192
+            command: /pacemaker_restart_bundle.sh rabbitmq-bundle oslo_messaging_rpc
205 193
             image: {get_param: DockerRabbitmqImage}
206 194
             volumes:
207 195
               list_concat:
208
-                - {get_attr: [ContainersCommon, volumes]}
209
-                -
210
-                  - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
211
-                - if:
212
-                  - docker_enabled
213
-                  - - /etc/corosync/corosync.conf:/etc/corosync/corosync.conf:ro
214
-                  - null
196
+                - {get_attr: [ContainersCommon, pacemaker_restart_volumes]}
197
+                - - /var/lib/config-data/puppet-generated/rabbitmq/:/var/lib/kolla/config_files/src:ro
215 198
           rabbitmq_init_bundle:
216 199
             start_order: 1
217 200
             detach: false

Loading…
Cancel
Save