openstack/kolla-ansible
Code Issues Proposed changes

Move scripts for cinder to docker_templates

Browse Source 
Change-Id: Id19cedf33e2acbbeebbde1c8d36e092225a25fe2
Partially-Implements: blueprint remove-docker-dir
This commit is contained in:
Steven Dake 2015-08-27 17:40:42 -07:00
parent 8930c12922
commit ccdc01fb49
16 changed files with 103 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/common/cinder/cinder-api/config-external.sh
View File

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

21
docker/common/cinder/cinder-api/start.sh
View File

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

10
docker/common/cinder/cinder-backup/config-external.sh
View File

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

14
docker/common/cinder/cinder-backup/start.sh
View File

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

10
docker/common/cinder/cinder-scheduler/config-external.sh
View File

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

14
docker/common/cinder/cinder-scheduler/start.sh
View File

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

10
docker/common/cinder/cinder-volume/config-external.sh
View File

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

14
docker/common/cinder/cinder-volume/start.sh
View File

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

1
docker_templates/cinder/cinder-api/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-api/config-external.sh

10
docker_templates/cinder/cinder-api/config-external.sh Normal file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/cinder/cinder-api/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-api/start.sh

21
docker_templates/cinder/cinder-api/start.sh Executable file
View File

@ -0,0 +1,21 @@
#!/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

1
docker_templates/cinder/cinder-backup/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-backup/config-external.sh

10
docker_templates/cinder/cinder-backup/config-external.sh Normal file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/cinder/cinder-backup/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-backup/start.sh

14
docker_templates/cinder/cinder-backup/start.sh Executable file
View File

@ -0,0 +1,14 @@
#!/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

1
docker_templates/cinder/cinder-scheduler/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-scheduler/config-external.sh

10
docker_templates/cinder/cinder-scheduler/config-external.sh Normal file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/cinder/cinder-scheduler/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-scheduler/start.sh

14
docker_templates/cinder/cinder-scheduler/start.sh Executable file
View File

@ -0,0 +1,14 @@
#!/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

1
docker_templates/cinder/cinder-volume/config-external.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-volume/config-external.sh

10
docker_templates/cinder/cinder-volume/config-external.sh Executable file
View File

@ -0,0 +1,10 @@
#!/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

1
docker_templates/cinder/cinder-volume/start.sh
View File

@ -1 +0,0 @@
../../../docker/common/cinder/cinder-volume/start.sh

14
docker_templates/cinder/cinder-volume/start.sh Executable file
View File

@ -0,0 +1,14 @@
#!/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