diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-12 09:04:10 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-12 12:04:58 -0700 |
| commit | 8ae3b0d67e92450adf2ae411d64d5710d7da3687 (patch) | |
| tree | 61934e7b81fed16828ed0d5419edf1442c272bba /docker/common/cinder-app | |
| parent | e323cbe11ec4731e672822013fb773c02d0b984e (diff) | |
| download | kolla-8ae3b0d67e92450adf2ae411d64d5710d7da3687.tar.gz kolla-8ae3b0d67e92450adf2ae411d64d5710d7da3687.zip | |
Rename cinder-app to cinder to be more consistent
Closes-Bug: #1482986
Change-Id: I72619ef18d24038b46d09e77887d6610ef6e8327
Diffstat (limited to 'docker/common/cinder-app')
| -rwxr-xr-x | docker/common/cinder-app/cinder-api/check.sh | 16 | ||||
| -rw-r--r-- | docker/common/cinder-app/cinder-api/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/cinder-app/cinder-api/start.sh | 21 | ||||
| -rw-r--r-- | docker/common/cinder-app/cinder-backup/config-external.sh | 9 | ||||
| -rwxr-xr-x | docker/common/cinder-app/cinder-backup/start.sh | 14 | ||||
| -rw-r--r-- | docker/common/cinder-app/cinder-scheduler/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/cinder-app/cinder-scheduler/start.sh | 14 | ||||
| -rwxr-xr-x | docker/common/cinder-app/cinder-volume/config-external.sh | 10 | ||||
| -rwxr-xr-x | docker/common/cinder-app/cinder-volume/start.sh | 14 |
9 files changed, 0 insertions, 118 deletions
diff --git a/docker/common/cinder-app/cinder-api/check.sh b/docker/common/cinder-app/cinder-api/check.sh deleted file mode 100755 index 57b88f566..000000000 --- a/docker/common/cinder-app/cinder-api/check.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -RES=0 - -. /openrc -if ! keystone token-get > /dev/null; then - echo "ERROR: keystone token-get failed" >&2 - RES=1 -else - if ! cinder list > /dev/null; then - echo "ERROR: cinder list failed" >&2 - RES=1 - fi -fi - -exit $RES diff --git a/docker/common/cinder-app/cinder-api/config-external.sh b/docker/common/cinder-app/cinder-api/config-external.sh deleted file mode 100644 index 5f57ab939..000000000 --- a/docker/common/cinder-app/cinder-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder/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-app/cinder-api/start.sh b/docker/common/cinder-app/cinder-api/start.sh deleted file mode 100755 index e6f79b3a6..000000000 --- a/docker/common/cinder-app/cinder-api/start.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-api" -ARGS="" - -# 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-app/cinder-backup/config-external.sh b/docker/common/cinder-app/cinder-backup/config-external.sh deleted file mode 100644 index b3d258251..000000000 --- a/docker/common/cinder-app/cinder-backup/config-external.sh +++ /dev/null @@ -1,9 +0,0 @@ -OURCE="/opt/kolla/cinder/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-app/cinder-backup/start.sh b/docker/common/cinder-app/cinder-backup/start.sh deleted file mode 100755 index 748c47d91..000000000 --- a/docker/common/cinder-app/cinder-backup/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-backup" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/cinder-app/cinder-scheduler/config-external.sh b/docker/common/cinder-app/cinder-scheduler/config-external.sh deleted file mode 100644 index 5f57ab939..000000000 --- a/docker/common/cinder-app/cinder-scheduler/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder/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-app/cinder-scheduler/start.sh b/docker/common/cinder-app/cinder-scheduler/start.sh deleted file mode 100755 index 9f68b61b3..000000000 --- a/docker/common/cinder-app/cinder-scheduler/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-scheduler" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS diff --git a/docker/common/cinder-app/cinder-volume/config-external.sh b/docker/common/cinder-app/cinder-volume/config-external.sh deleted file mode 100755 index 5f57ab939..000000000 --- a/docker/common/cinder-app/cinder-volume/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder/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-app/cinder-volume/start.sh b/docker/common/cinder-app/cinder-volume/start.sh deleted file mode 100755 index 424fdfa7c..000000000 --- a/docker/common/cinder-app/cinder-volume/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-volume" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -set_configs - -exec $CMD $ARGS |
