aboutsummaryrefslogtreecommitdiff
path: root/docker/common/nova-controller/nova-consoleauth
diff options
context:
space:
mode:
authorSwapnil Kulkarni <me@coolsvap.net>2015-07-15 10:32:21 +0000
committerSwapnil Kulkarni <me@coolsvap.net>2015-07-16 11:37:40 +0000
commit51b7915ae8094fe149ff1752be01d6ff29fed15e (patch)
treed96b1ee8b7898f7ea22006990cc8f2a9572aa45e /docker/common/nova-controller/nova-consoleauth
parent5c8561b1d71cf9d20dc533a1cf369cd9dbaeadb5 (diff)
downloadkolla-51b7915ae8094fe149ff1752be01d6ff29fed15e.tar.gz
kolla-51b7915ae8094fe149ff1752be01d6ff29fed15e.zip
Updated directory structure to make it consistent
Closes-Bug: #1474774 Change-Id: Id61d777a8b741c800e0d034e3ee889c11bcf5fbc
Diffstat (limited to 'docker/common/nova-controller/nova-consoleauth')
-rwxr-xr-xdocker/common/nova-controller/nova-consoleauth/config-external.sh10
-rwxr-xr-xdocker/common/nova-controller/nova-consoleauth/config-internal.sh11
-rwxr-xr-xdocker/common/nova-controller/nova-consoleauth/start.sh13
3 files changed, 0 insertions, 34 deletions
diff --git a/docker/common/nova-controller/nova-consoleauth/config-external.sh b/docker/common/nova-controller/nova-consoleauth/config-external.sh
deleted file mode 100755
index 1da10d83f..000000000
--- a/docker/common/nova-controller/nova-consoleauth/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/nova-consoleauth/nova.conf"
-TARGET="/etc/nova/nova.conf"
-OWNER="nova"
-
-if [[ -f "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0644 $TARGET
-fi
diff --git a/docker/common/nova-controller/nova-consoleauth/config-internal.sh b/docker/common/nova-controller/nova-consoleauth/config-internal.sh
deleted file mode 100755
index a1b0864ac..000000000
--- a/docker/common/nova-controller/nova-consoleauth/config-internal.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-. /opt/kolla/config-nova.sh
-
-cfg=/etc/nova/nova.conf
-
-crudini --set $cfg DEFAULT log_file "${NOVA_CONSOLEAUTH_LOG_FILE}"
-
-echo Starting nova-consoleauth
-exec /usr/bin/nova-consoleauth
diff --git a/docker/common/nova-controller/nova-consoleauth/start.sh b/docker/common/nova-controller/nova-consoleauth/start.sh
deleted file mode 100755
index 88f1b7a6b..000000000
--- a/docker/common/nova-controller/nova-consoleauth/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/nova-consoleauth"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Config-internal script exec out of this function, it does not return here.
-set_configs
-
-exec $CMD $ARGS