Merge "Do not restart bundles during a minor update"

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

@@ -185,12 +185,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'cinder_backup'
               - str_replace:
                   template:
-                    'if /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'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerCinderBackupImage}

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

@@ -169,12 +169,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'cinder_volume'
               - str_replace:
                   template:
-                    'if /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'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerCinderVolumeImage}

deployment/database/mysql-pacemaker-puppet.yaml

@@ -268,12 +268,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'mysql'
               - str_replace:
                   template:
-                    'if /usr/sbin/pcs resource show galera-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT galera-bundle; echo "galera-bundle restart invoked"; fi'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerMysqlImage}

deployment/database/redis-pacemaker-puppet.yaml

@@ -216,12 +216,14 @@ outputs:
                 net: host
                 ipc: host
                 user: root
+                environment:
+                  - TRIPLEO_MINOR_UPDATE
                 command:
                   - '/usr/bin/bootstrap_host_exec'
                   - 'redis'
                   - str_replace:
                       template:
-                        'if /usr/sbin/pcs resource show redis-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT redis-bundle; echo "redis-bundle restart invoked"; fi'
+                        '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'
                       params:
                         PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
                 image: {get_param: DockerRedisConfigImage}

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -235,12 +235,14 @@ outputs:
             ipc: host
             user: root
             config_volume: haproxy
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'haproxy'
               - str_replace:
                   template:
-                    'if /usr/sbin/pcs resource show haproxy-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT haproxy-bundle; echo "haproxy-bundle restart invoked"; fi'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerHAProxyImage}

deployment/manila/manila-share-pacemaker-puppet.yaml

@@ -150,12 +150,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'manila_share'
               - str_replace:
                   template:
-                    'if /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'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerManilaShareImage}

deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml

@@ -191,12 +191,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'oslo_messaging_notify'
               - str_replace:
                   template:
-                    'if /usr/sbin/pcs resource show rabbitmq-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT rabbitmq-bundle; echo "rabbitmq-bundle restart invoked"; fi'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerRabbitmqImage}

deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml

@@ -191,12 +191,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'rabbitmq'
               - str_replace:
                   template:
-                    'if /usr/sbin/pcs resource show rabbitmq-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT rabbitmq-bundle; echo "rabbitmq-bundle restart invoked"; fi'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerRabbitmqImage}

deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

@@ -191,12 +191,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'oslo_messaging_rpc'
               - str_replace:
                   template:
-                    'if /usr/sbin/pcs resource show rabbitmq-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT rabbitmq-bundle; echo "rabbitmq-bundle restart invoked"; fi'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerRabbitmqImage}

docker/services/pacemaker/ovn-dbs.yaml

@@ -134,12 +134,14 @@ outputs:
             net: host
             ipc: host
             user: root
+            environment:
+              - TRIPLEO_MINOR_UPDATE
             command:
               - '/usr/bin/bootstrap_host_exec'
               - 'ovn_dbs'
               - str_replace:
                   template:
-                    'if /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'
+                    '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'
                   params:
                     PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
             image: {get_param: DockerOvnDbsConfigImage}