aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 17:40:42 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:29 -0700
commitccdc01fb49f451366e89984bdfc61b793db62bcb (patch)
tree9556aa5175b1c8576542b19e933612ed5d201164 /docker
parent8930c12922509a52c6ef8d0475ca5adefb61ea27 (diff)
downloadkolla-ccdc01fb49f451366e89984bdfc61b793db62bcb.tar.gz
kolla-ccdc01fb49f451366e89984bdfc61b793db62bcb.zip
Move scripts for cinder to docker_templates
Change-Id: Id19cedf33e2acbbeebbde1c8d36e092225a25fe2 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker')
-rw-r--r--docker/common/cinder/cinder-api/config-external.sh10
-rwxr-xr-xdocker/common/cinder/cinder-api/start.sh21
-rw-r--r--docker/common/cinder/cinder-backup/config-external.sh10
-rwxr-xr-xdocker/common/cinder/cinder-backup/start.sh14
-rw-r--r--docker/common/cinder/cinder-scheduler/config-external.sh10
-rwxr-xr-xdocker/common/cinder/cinder-scheduler/start.sh14
-rwxr-xr-xdocker/common/cinder/cinder-volume/config-external.sh10
-rwxr-xr-xdocker/common/cinder/cinder-volume/start.sh14
8 files changed, 0 insertions, 103 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