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
)
This commit is contained in:
parent
ca966eef90
commit
aeeacb507f
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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…
Reference in New Issue