Browse Source

Merge "Bind mount /var/lib/container-config-scripts inside the restart bundles" into stable/train

changes/30/752230/3
Zuul 10 months ago
committed by Gerrit Code Review
parent
commit
c26ccfdaf4
  1. 2
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  2. 2
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  3. 3
      deployment/containers-common.yaml
  4. 2
      deployment/database/mysql-pacemaker-puppet.yaml
  5. 2
      deployment/database/redis-pacemaker-puppet.yaml
  6. 2
      deployment/haproxy/haproxy-pacemaker-puppet.yaml
  7. 2
      deployment/manila/manila-share-pacemaker-puppet.yaml
  8. 2
      deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
  9. 2
      deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
  10. 2
      deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
  11. 2
      deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml

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

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

3
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

2
deployment/database/mysql-pacemaker-puppet.yaml

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

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

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

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

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

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

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

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

Loading…
Cancel
Save