Browse Source

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 233710ad5d)
changes/54/750454/1
Michele Baldessari 2 months ago
parent
commit
aeeacb507f
11 changed files with 11 additions and 12 deletions
  1. +1
    -1
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  2. +1
    -1
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  3. +1
    -2
      deployment/containers-common.yaml
  4. +1
    -1
      deployment/database/mysql-pacemaker-puppet.yaml
  5. +1
    -1
      deployment/database/redis-pacemaker-puppet.yaml
  6. +1
    -1
      deployment/haproxy/haproxy-pacemaker-puppet.yaml
  7. +1
    -1
      deployment/manila/manila-share-pacemaker-puppet.yaml
  8. +1
    -1
      deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
  9. +1
    -1
      deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
  10. +1
    -1
      deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
  11. +1
    -1
      deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

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

@@ -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:


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

@@ -210,7 +210,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:


+ 1
- 2
deployment/containers-common.yaml View File

@@ -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


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

@@ -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:


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

@@ -275,7 +275,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:


+ 1
- 1
deployment/haproxy/haproxy-pacemaker-puppet.yaml View File

@@ -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:


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

@@ -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:


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

@@ -254,7 +254,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:


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

@@ -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:


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

@@ -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:


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

@@ -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:


Loading…
Cancel
Save