diff options
16 files changed, 103 insertions, 111 deletions
diff --git a/docker/common/cinder/cinder-api/config-external.sh b/docker/common/cinder/cinder-api/config-external.sh deleted file mode 100644 index 08d8cde0a..000000000 --- a/docker/common/cinder/cinder-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder-api/cinder.conf" -TARGET="/etc/cinder/cinder.conf" -OWNER="cinder" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/cinder/cinder-api/start.sh b/docker/common/cinder/cinder-api/start.sh deleted file mode 100755 index 6c61b3a4e..000000000 --- a/docker/common/cinder/cinder-api/start.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-api" -ARGS="--config-file /etc/cinder/cinder.conf" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - su -s /bin/sh -c "cinder-manage db sync" cinder - exit 0 -fi - -exec $CMD $ARGS diff --git a/docker/common/cinder/cinder-backup/config-external.sh b/docker/common/cinder/cinder-backup/config-external.sh deleted file mode 100644 index ff4752492..000000000 --- a/docker/common/cinder/cinder-backup/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder-backup/cinder.conf" -TARGET="/etc/cinder/cinder.conf" -OWNER="cinder" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/cinder/cinder-backup/start.sh b/docker/common/cinder/cinder-backup/start.sh deleted file mode 100755 index 7d9403f07..000000000 --- a/docker/common/cinder/cinder-backup/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-backup" -ARGS="--config-file /etc/cinder/cinder.conf" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/cinder/cinder-scheduler/config-external.sh b/docker/common/cinder/cinder-scheduler/config-external.sh deleted file mode 100644 index 3c8ca26be..000000000 --- a/docker/common/cinder/cinder-scheduler/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder-scheduler/cinder.conf" -TARGET="/etc/cinder/cinder.conf" -OWNER="cinder" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/cinder/cinder-scheduler/start.sh b/docker/common/cinder/cinder-scheduler/start.sh deleted file mode 100755 index 759175e3f..000000000 --- a/docker/common/cinder/cinder-scheduler/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-scheduler" -ARGS="--config-file /etc/cinder/cinder.conf" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/cinder/cinder-volume/config-external.sh b/docker/common/cinder/cinder-volume/config-external.sh deleted file mode 100755 index 2f6b99fc9..000000000 --- a/docker/common/cinder/cinder-volume/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder-volume/cinder.conf" -TARGET="/etc/cinder/cinder.conf" -OWNER="cinder" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker/common/cinder/cinder-volume/start.sh b/docker/common/cinder/cinder-volume/start.sh deleted file mode 100755 index a6874ce47..000000000 --- a/docker/common/cinder/cinder-volume/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-volume" -ARGS="--config-file /etc/cinder/cinder.conf" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker_templates/cinder/cinder-api/config-external.sh b/docker_templates/cinder/cinder-api/config-external.sh index dc4bc440d..08d8cde0a 120000..100644 --- a/docker_templates/cinder/cinder-api/config-external.sh +++ b/docker_templates/cinder/cinder-api/config-external.sh @@ -1 +1,10 @@ -../../../docker/common/cinder/cinder-api/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/cinder-api/cinder.conf" +TARGET="/etc/cinder/cinder.conf" +OWNER="cinder" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/cinder/cinder-api/start.sh b/docker_templates/cinder/cinder-api/start.sh index 3cb418178..6c61b3a4e 120000..100755 --- a/docker_templates/cinder/cinder-api/start.sh +++ b/docker_templates/cinder/cinder-api/start.sh @@ -1 +1,21 @@ -../../../docker/common/cinder/cinder-api/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/cinder-api" +ARGS="--config-file /etc/cinder/cinder.conf" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + su -s /bin/sh -c "cinder-manage db sync" cinder + exit 0 +fi + +exec $CMD $ARGS diff --git a/docker_templates/cinder/cinder-backup/config-external.sh b/docker_templates/cinder/cinder-backup/config-external.sh index ad560f28d..ff4752492 120000..100644 --- a/docker_templates/cinder/cinder-backup/config-external.sh +++ b/docker_templates/cinder/cinder-backup/config-external.sh @@ -1 +1,10 @@ -../../../docker/common/cinder/cinder-backup/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/cinder-backup/cinder.conf" +TARGET="/etc/cinder/cinder.conf" +OWNER="cinder" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/cinder/cinder-backup/start.sh b/docker_templates/cinder/cinder-backup/start.sh index 4402c4f21..7d9403f07 120000..100755 --- a/docker_templates/cinder/cinder-backup/start.sh +++ b/docker_templates/cinder/cinder-backup/start.sh @@ -1 +1,14 @@ -../../../docker/common/cinder/cinder-backup/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/cinder-backup" +ARGS="--config-file /etc/cinder/cinder.conf" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS diff --git a/docker_templates/cinder/cinder-scheduler/config-external.sh b/docker_templates/cinder/cinder-scheduler/config-external.sh index 5039b8125..3c8ca26be 120000..100644 --- a/docker_templates/cinder/cinder-scheduler/config-external.sh +++ b/docker_templates/cinder/cinder-scheduler/config-external.sh @@ -1 +1,10 @@ -../../../docker/common/cinder/cinder-scheduler/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/cinder-scheduler/cinder.conf" +TARGET="/etc/cinder/cinder.conf" +OWNER="cinder" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/cinder/cinder-scheduler/start.sh b/docker_templates/cinder/cinder-scheduler/start.sh index 352594b0a..759175e3f 120000..100755 --- a/docker_templates/cinder/cinder-scheduler/start.sh +++ b/docker_templates/cinder/cinder-scheduler/start.sh @@ -1 +1,14 @@ -../../../docker/common/cinder/cinder-scheduler/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/cinder-scheduler" +ARGS="--config-file /etc/cinder/cinder.conf" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS diff --git a/docker_templates/cinder/cinder-volume/config-external.sh b/docker_templates/cinder/cinder-volume/config-external.sh index a792ffcf7..2f6b99fc9 120000..100755 --- a/docker_templates/cinder/cinder-volume/config-external.sh +++ b/docker_templates/cinder/cinder-volume/config-external.sh @@ -1 +1,10 @@ -../../../docker/common/cinder/cinder-volume/config-external.sh
\ No newline at end of file +#!/bin/bash +SOURCE="/opt/kolla/cinder-volume/cinder.conf" +TARGET="/etc/cinder/cinder.conf" +OWNER="cinder" + +if [[ -f "$SOURCE" ]]; then + cp $SOURCE $TARGET + chown ${OWNER}: $TARGET + chmod 0644 $TARGET +fi diff --git a/docker_templates/cinder/cinder-volume/start.sh b/docker_templates/cinder/cinder-volume/start.sh index 1358e133b..a6874ce47 120000..100755 --- a/docker_templates/cinder/cinder-volume/start.sh +++ b/docker_templates/cinder/cinder-volume/start.sh @@ -1 +1,14 @@ -../../../docker/common/cinder/cinder-volume/start.sh
\ No newline at end of file +#!/bin/bash + +set -o errexit + +CMD="/usr/bin/cinder-volume" +ARGS="--config-file /etc/cinder/cinder.conf" + +# Loading common functions. +source /opt/kolla/kolla-common.sh + +# Execute config strategy +set_configs + +exec $CMD $ARGS |