From 528a7f6d01cec2cbd5a5e2d3fff5c3936976e91b Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 15 Jul 2020 10:34:15 +0200 Subject: [PATCH] Bind mount /var/lib/container-config-scripts inside the restart bundles Bind mounting the single files is never a good idea and we're actually planning to potentially add one more script in there to be used by the restart bundles, so best if we bind mount the whole folder and use that directly. Change-Id: I881f6fdb7f99575f017fb86d6ab2dc3d55348e46 (cherry picked from commit 233710ad5d77f9341b121e523290048526c97382) (cherry picked from commit aeeacb507fd81de3031c9d0a313bccd1da0cae10) --- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 2 +- deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 2 +- deployment/containers-common.yaml | 3 +-- deployment/database/mysql-pacemaker-puppet.yaml | 2 +- deployment/database/redis-pacemaker-puppet.yaml | 2 +- deployment/haproxy/haproxy-pacemaker-puppet.yaml | 2 +- deployment/manila/manila-share-pacemaker-puppet.yaml | 2 +- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml | 2 +- deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 217963f1a9..6c32603418 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -229,7 +229,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh cinder_backup openstack-cinder-backup openstack-cinder-backup _ Started + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh cinder_backup openstack-cinder-backup openstack-cinder-backup _ Started image: {get_param: ContainerCinderBackupImage} volumes: list_concat: diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 78317bc614..d78268c7f1 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -209,7 +209,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh cinder_volume openstack-cinder-volume openstack-cinder-volume _ Started + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh cinder_volume openstack-cinder-volume openstack-cinder-volume _ Started image: {get_param: ContainerCinderVolumeImage} volumes: list_concat: diff --git a/deployment/containers-common.yaml b/deployment/containers-common.yaml index 7aa9faaaca..a67b734b7c 100644 --- a/deployment/containers-common.yaml +++ b/deployment/containers-common.yaml @@ -158,8 +158,7 @@ outputs: value: list_concat: - *volumes_base - - - /var/lib/container-config-scripts/pacemaker_restart_bundle.sh:/pacemaker_restart_bundle.sh:ro - - /var/lib/container-config-scripts/pacemaker_wait_bundle.sh:/pacemaker_wait_bundle.sh:ro + - - /var/lib/container-config-scripts:/var/lib/container-config-scripts:ro - /dev/shm:/dev/shm:rw # required for bootstrap_host_exec, facter - /etc/puppet:/etc/puppet:ro diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index d82bc436f0..b439c72c98 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -301,7 +301,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh mysql galera galera-bundle Master + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh mysql galera galera-bundle Master image: {get_param: ContainerMysqlImage} volumes: list_concat: diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 70373685ab..34c64f9b2b 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -262,7 +262,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh redis redis redis-bundle Slave Master + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh redis redis redis-bundle Slave Master image: {get_param: ContainerRedisConfigImage} volumes: list_concat: diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index 9c9430d4b1..e4beacf904 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -291,7 +291,7 @@ outputs: config_volume: haproxy environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh haproxy haproxy-bundle haproxy-bundle Started + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh haproxy haproxy-bundle haproxy-bundle Started image: {get_param: ContainerHAProxyImage} volumes: list_concat: diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index ba73a72edd..2624d5f617 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -188,7 +188,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh manila_share openstack-manila-share openstack-manila-share _ Started + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh manila_share openstack-manila-share openstack-manila-share _ Started image: {get_param: ContainerManilaShareImage} volumes: list_concat: diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 8ca4f5fe9a..770e1b776e 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -248,7 +248,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh ovn_dbs ovndb_servers ovn-dbs-bundle Slave Master + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh ovn_dbs ovndb_servers ovn-dbs-bundle Slave Master image: {get_param: ContainerOvnDbsConfigImage} volumes: list_concat: diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 0dbbb215a9..33a4318711 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -233,7 +233,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh oslo_messaging_notify rabbitmq rabbitmq-bundle Started + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh oslo_messaging_notify rabbitmq rabbitmq-bundle Started image: {get_param: ContainerRabbitmqImage} volumes: list_concat: diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index b94c387583..53daab7e6f 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -233,7 +233,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh rabbitmq rabbitmq rabbitmq-bundle Started + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh rabbitmq rabbitmq rabbitmq-bundle Started image: {get_param: ContainerRabbitmqImage} volumes: list_concat: diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 980076ed2d..b834a5595f 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -239,7 +239,7 @@ outputs: user: root environment: TRIPLEO_MINOR_UPDATE: '' - command: /pacemaker_restart_bundle.sh oslo_messaging_rpc rabbitmq rabbitmq-bundle Started + command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh oslo_messaging_rpc rabbitmq rabbitmq-bundle Started image: {get_param: ContainerRabbitmqImage} volumes: list_concat: