diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml index 71381f7544..b33cece913 100644 --- a/docker/services/pacemaker/cinder-backup.yaml +++ b/docker/services/pacemaker/cinder-backup.yaml @@ -187,12 +187,14 @@ outputs: detach: false net: 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} diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml index 3ce5509872..922150474a 100644 --- a/docker/services/pacemaker/cinder-volume.yaml +++ b/docker/services/pacemaker/cinder-volume.yaml @@ -172,12 +172,14 @@ outputs: detach: false net: 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} diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml index 47843ccbeb..014bd8ea81 100644 --- a/docker/services/pacemaker/database/mysql.yaml +++ b/docker/services/pacemaker/database/mysql.yaml @@ -258,12 +258,14 @@ outputs: detach: false net: 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} diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml index 6fc13c620b..203067b857 100644 --- a/docker/services/pacemaker/database/redis.yaml +++ b/docker/services/pacemaker/database/redis.yaml @@ -215,12 +215,14 @@ outputs: detach: false net: 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} diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml index eb94fa6e00..d1661a9ab9 100644 --- a/docker/services/pacemaker/haproxy.yaml +++ b/docker/services/pacemaker/haproxy.yaml @@ -235,12 +235,14 @@ outputs: net: 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} diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml index 637710ffad..017dac67ac 100644 --- a/docker/services/pacemaker/manila-share.yaml +++ b/docker/services/pacemaker/manila-share.yaml @@ -166,12 +166,14 @@ outputs: detach: false net: 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} diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml index 5f15880961..c0dc31ca3f 100644 --- a/docker/services/pacemaker/ovn-dbs.yaml +++ b/docker/services/pacemaker/ovn-dbs.yaml @@ -151,12 +151,14 @@ outputs: detach: false net: 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} diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml index d3d6bc09ca..14e56dbb0e 100644 --- a/docker/services/pacemaker/rabbitmq.yaml +++ b/docker/services/pacemaker/rabbitmq.yaml @@ -206,12 +206,14 @@ outputs: detach: false net: 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}