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

deployment/cinder/cinder-backup-pacemaker-puppet.yaml

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

deployment/cinder/cinder-volume-pacemaker-puppet.yaml

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

deployment/containers-common.yaml

@@ -155,8 +155,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:/var/lib/container-config-scripts:ro
-          - /var/lib/container-config-scripts/pacemaker_wait_bundle.sh:/pacemaker_wait_bundle.sh:ro
           - /dev/shm:/dev/shm:rw
           # required for bootstrap_host_exec, facter
           - /etc/puppet:/etc/puppet:ro

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:

deployment/database/redis-pacemaker-puppet.yaml

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

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:

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:

deployment/ovn/ovn-dbs-pacemaker-puppet.yaml

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

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:

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:

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: