Rename cinder-app to cinder to be more consistent

Closes-Bug: #1482986
Change-Id: I72619ef18d24038b46d09e77887d6610ef6e8327

9 files changed, 118 insertions, 0 deletions

diff --git a/docker/common/cinder/cinder-api/check.sh b/docker/common/cinder/cinder-api/check.sh
new file mode 100755
index 000000000..57b88f566
--- /dev/null
+++ b/docker/common/cinder/cinder-api/check.sh
@@ -0,0 +1,16 @@
+#!/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/cinder-api/config-external.sh b/docker/common/cinder/cinder-api/config-external.sh
new file mode 100644
index 000000000..5f57ab939
--- /dev/null
+++ b/docker/common/cinder/cinder-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/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/cinder-api/start.sh b/docker/common/cinder/cinder-api/start.sh
new file mode 100755
index 000000000..e6f79b3a6
--- /dev/null
+++ b/docker/common/cinder/cinder-api/start.sh
@@ -0,0 +1,21 @@
+#!/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/cinder-backup/config-external.sh b/docker/common/cinder/cinder-backup/config-external.sh
new file mode 100644
index 000000000..b3d258251
--- /dev/null
+++ b/docker/common/cinder/cinder-backup/config-external.sh
@@ -0,0 +1,9 @@
+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/cinder-backup/start.sh b/docker/common/cinder/cinder-backup/start.sh
new file mode 100755
index 000000000..748c47d91
--- /dev/null
+++ b/docker/common/cinder/cinder-backup/start.sh
@@ -0,0 +1,14 @@
+#!/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/cinder-scheduler/config-external.sh b/docker/common/cinder/cinder-scheduler/config-external.sh
new file mode 100644
index 000000000..5f57ab939
--- /dev/null
+++ b/docker/common/cinder/cinder-scheduler/config-external.sh
@@ -0,0 +1,10 @@
+#!/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/cinder-scheduler/start.sh b/docker/common/cinder/cinder-scheduler/start.sh
new file mode 100755
index 000000000..9f68b61b3
--- /dev/null
+++ b/docker/common/cinder/cinder-scheduler/start.sh
@@ -0,0 +1,14 @@
+#!/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/cinder-volume/config-external.sh b/docker/common/cinder/cinder-volume/config-external.sh
new file mode 100755
index 000000000..5f57ab939
--- /dev/null
+++ b/docker/common/cinder/cinder-volume/config-external.sh
@@ -0,0 +1,10 @@
+#!/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/cinder-volume/start.sh b/docker/common/cinder/cinder-volume/start.sh
new file mode 100755
index 000000000..424fdfa7c
--- /dev/null
+++ b/docker/common/cinder/cinder-volume/start.sh
@@ -0,0 +1,14 @@
+#!/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