diff options
Diffstat (limited to 'docker')
41 files changed, 41 insertions, 41 deletions
diff --git a/docker/ceilometer/ceilometer-alarm/start.sh b/docker/ceilometer/ceilometer-alarm/start.sh index 2096348c4..7470ae608 100644 --- a/docker/ceilometer/ceilometer-alarm/start.sh +++ b/docker/ceilometer/ceilometer-alarm/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/start.sh index bca5a1aaa..f081c9f84 100644 --- a/docker/ceilometer/ceilometer-api/start.sh +++ b/docker/ceilometer/ceilometer-api/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/ceilometer/ceilometer-base/config-ceilometer.sh index 9df45994a..a2316dcd1 100644 --- a/docker/ceilometer/ceilometer-base/config-ceilometer.sh +++ b/docker/ceilometer/ceilometer-base/config-ceilometer.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e . /opt/kolla/kolla-common.sh diff --git a/docker/ceilometer/ceilometer-central/start.sh b/docker/ceilometer/ceilometer-central/start.sh index 406245f2d..76f9a1fc2 100644 --- a/docker/ceilometer/ceilometer-central/start.sh +++ b/docker/ceilometer/ceilometer-central/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . /opt/kolla/kolla-common.sh . /opt/kolla/config-ceilometer.sh diff --git a/docker/ceilometer/ceilometer-collector/start.sh b/docker/ceilometer/ceilometer-collector/start.sh index 21de9d315..1ed4c9e7d 100644 --- a/docker/ceilometer/ceilometer-collector/start.sh +++ b/docker/ceilometer/ceilometer-collector/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh index 84fe7ab1d..f4fc30bae 100644 --- a/docker/ceilometer/ceilometer-compute/start.sh +++ b/docker/ceilometer/ceilometer-compute/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . /opt/kolla/kolla-common.sh . /opt/kolla/config-ceilometer.sh diff --git a/docker/ceilometer/ceilometer-notification/start.sh b/docker/ceilometer/ceilometer-notification/start.sh index f2f84789e..939734549 100644 --- a/docker/ceilometer/ceilometer-notification/start.sh +++ b/docker/ceilometer/ceilometer-notification/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/glance/glance-api/check.sh b/docker/glance/glance-api/check.sh index 63c265464..f97ef70f4 100755 --- a/docker/glance/glance-api/check.sh +++ b/docker/glance/glance-api/check.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh index e5e327a5b..c546333f4 100755 --- a/docker/glance/glance-api/start.sh +++ b/docker/glance/glance-api/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh index 137815e70..aed044df5 100644 --- a/docker/glance/glance-base/config-glance.sh +++ b/docker/glance/glance-base/config-glance.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh index 2337727e8..5f590fb1c 100755 --- a/docker/glance/glance-registry/start.sh +++ b/docker/glance/glance-registry/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/heat/heat-api/check.sh b/docker/heat/heat-api/check.sh index eab8ee59b..ee03dc6d2 100755 --- a/docker/heat/heat-api/check.sh +++ b/docker/heat/heat-api/check.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/heat/heat-base/config-heat.sh b/docker/heat/heat-base/config-heat.sh index e0f3852ee..ef2d0f949 100755 --- a/docker/heat/heat-base/config-heat.sh +++ b/docker/heat/heat-base/config-heat.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/heat/heat-engine/start.sh b/docker/heat/heat-engine/start.sh index 8eda98f3d..2dfc78e92 100755 --- a/docker/heat/heat-engine/start.sh +++ b/docker/heat/heat-engine/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . /opt/kolla/kolla-common.sh . /opt/kolla/config-heat.sh diff --git a/docker/keystone/check.sh b/docker/keystone/check.sh index f96793861..ca4844784 100755 --- a/docker/keystone/check.sh +++ b/docker/keystone/check.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh index cb76496f9..408f250e0 100755 --- a/docker/keystone/start.sh +++ b/docker/keystone/start.sh @@ -124,7 +124,7 @@ chmod -R o-rwx /etc/keystone/ssl # Initialize the Keystone DB echo "Initializing Keystone DB" if [ "${INIT_DB}" == "true" ] ; then - su -s /bin/sh -c "keystone-manage db_sync" keystone + su -s /bin/bash -c "keystone-manage db_sync" keystone fi # Start Keystone diff --git a/docker/mariadb-app/config-mysql.sh b/docker/mariadb-app/config-mysql.sh index 5819000c5..0d39fa870 100755 --- a/docker/mariadb-app/config-mysql.sh +++ b/docker/mariadb-app/config-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . /opt/kolla/kolla-common.sh diff --git a/docker/mariadb-data/Dockerfile b/docker/mariadb-data/Dockerfile index a55831311..627884a68 100644 --- a/docker/mariadb-data/Dockerfile +++ b/docker/mariadb-data/Dockerfile @@ -5,4 +5,4 @@ VOLUME [ "/var/lib/mysql" ] # Command needed to start the data container. # Note: data containers do not need to be persistent. -CMD ["/bin/sh"] +CMD ["/bin/bash"] diff --git a/docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh b/docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh index 9c36f1996..7dda736ef 100755 --- a/docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh +++ b/docker/neutron/neutron-agents/check-scripts/check-dhcp-agent.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh b/docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh index b79caf8ff..d32c1e272 100755 --- a/docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh +++ b/docker/neutron/neutron-agents/check-scripts/check-l3-agent.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh b/docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh index 96b472490..7de97df9d 100755 --- a/docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh +++ b/docker/neutron/neutron-agents/check-scripts/check-linuxbridge-agent.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh b/docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh index ba2474d48..fd1c6812b 100755 --- a/docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh +++ b/docker/neutron/neutron-agents/check-scripts/check-metadata-agent.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/neutron/neutron-base/config-neutron.sh b/docker/neutron/neutron-base/config-neutron.sh index 35ce787a4..f9107be76 100644 --- a/docker/neutron/neutron-base/config-neutron.sh +++ b/docker/neutron/neutron-base/config-neutron.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/neutron/neutron-server/check.sh b/docker/neutron/neutron-server/check.sh index 2a44cda91..4e9aa623c 100755 --- a/docker/neutron/neutron-server/check.sh +++ b/docker/neutron/neutron-server/check.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh index d07328937..c1ead6280 100755 --- a/docker/neutron/neutron-server/start.sh +++ b/docker/neutron/neutron-server/start.sh @@ -93,6 +93,6 @@ if [[ ${MECHANISM_DRIVERS} =~ linuxbridge ]]; then "${NEUTRON_FLAT_NETWORK_NAME}:${NEUTRON_FLAT_NETWORK_INTERFACE}" fi -su -s /bin/sh -c "neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade juno" neutron +su -s /bin/bash -c "neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade juno" neutron exec /usr/bin/neutron-server --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index 00365f1ad..f8f7788e3 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . /opt/kolla/kolla-common.sh diff --git a/docker/nova-compute/nova-compute/config-nova-compute.sh b/docker/nova-compute/nova-compute/config-nova-compute.sh index 6235e5426..cb1b01fa1 100755 --- a/docker/nova-compute/nova-compute/config-nova-compute.sh +++ b/docker/nova-compute/nova-compute/config-nova-compute.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . /opt/kolla/kolla-common.sh . /opt/kolla/config-nova.sh diff --git a/docker/nova-compute/nova-compute/start.sh b/docker/nova-compute/nova-compute/start.sh index 47354f866..bafe37add 100755 --- a/docker/nova-compute/nova-compute/start.sh +++ b/docker/nova-compute/nova-compute/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/nova-compute/nova-libvirt/start.sh b/docker/nova-compute/nova-libvirt/start.sh index 04e5f9792..47a09399b 100755 --- a/docker/nova-compute/nova-libvirt/start.sh +++ b/docker/nova-compute/nova-libvirt/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if [[ $(cat /proc/cpuinfo | grep vmx) ]]; then modprobe kvm_intel diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/nova-compute/nova-network/config-nova-network.sh index f8e036fda..6976d3a20 100755 --- a/docker/nova-compute/nova-network/config-nova-network.sh +++ b/docker/nova-compute/nova-network/config-nova-network.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . /opt/kolla/config-nova.sh diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh index b5fc89f85..b39a18ceb 100755 --- a/docker/nova-compute/nova-network/start.sh +++ b/docker/nova-compute/nova-network/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/nova-controller/nova-api/check.sh b/docker/nova-controller/nova-api/check.sh index a738b1002..b250682d8 100755 --- a/docker/nova-controller/nova-api/check.sh +++ b/docker/nova-controller/nova-api/check.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RES=0 diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index 5f615ed50..aedea15f2 100755 --- a/docker/nova-controller/nova-api/start.sh +++ b/docker/nova-controller/nova-api/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh index fa4bbd69a..aa6a75ac3 100755 --- a/docker/nova-controller/nova-conductor/start.sh +++ b/docker/nova-controller/nova-conductor/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh index bd093d01c..f386393dc 100755 --- a/docker/nova-controller/nova-scheduler/start.sh +++ b/docker/nova-controller/nova-scheduler/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh index 7ad7fbe75..3284368f3 100755 --- a/docker/rabbitmq/start.sh +++ b/docker/rabbitmq/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e diff --git a/docker/swift/swift-account/start.sh b/docker/swift/swift-account/start.sh index 884a24742..f634f6e54 100644 --- a/docker/swift/swift-account/start.sh +++ b/docker/swift/swift-account/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash : ${SWIFT_DB_USER:=swift} : ${SWIFT_DB_NAME:=swift} diff --git a/docker/swift/swift-container/start.sh b/docker/swift/swift-container/start.sh index 42b426c74..6e303872b 100644 --- a/docker/swift/swift-container/start.sh +++ b/docker/swift/swift-container/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash : ${SWIFT_DB_USER:=swift} : ${SWIFT_DB_NAME:=swift} diff --git a/docker/swift/swift-object/start.sh b/docker/swift/swift-object/start.sh index 430a87b69..8626e7678 100644 --- a/docker/swift/swift-object/start.sh +++ b/docker/swift/swift-object/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash : ${SWIFT_DB_USER:=swift} : ${SWIFT_DB_NAME:=swift} diff --git a/docker/swift/swift-proxy-server/start.sh b/docker/swift/swift-proxy-server/start.sh index dff824f46..3f387d187 100644 --- a/docker/swift/swift-proxy-server/start.sh +++ b/docker/swift/swift-proxy-server/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash sh /opt/swift/config-swift.sh proxy diff --git a/docker/zaqar/start.sh b/docker/zaqar/start.sh index 04680c8f9..7620a1859 100755 --- a/docker/zaqar/start.sh +++ b/docker/zaqar/start.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e |