From 9970519b4ed752b4a33e6125d1d09d51b75b8c5b Mon Sep 17 00:00:00 2001
From: Harm Weites <harm@weites.com>
Date: Thu, 2 Jul 2015 14:24:33 +0200
Subject: Add config-internal/config-external to Nova-controller containers

Partially Implements: Blueprint standard-start

Change-Id: I40a863161bee779a944e9388a1ad7d5d0e7adba7
---
 .../nova-controller/nova-consoleauth/config-external.sh    | 10 ++++++++++
 .../nova-controller/nova-consoleauth/config-internal.sh    | 11 +++++++++++
 docker/common/nova-controller/nova-consoleauth/start.sh    | 14 ++++++++------
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100755 docker/common/nova-controller/nova-consoleauth/config-external.sh
 create mode 100755 docker/common/nova-controller/nova-consoleauth/config-internal.sh

(limited to 'docker/common/nova-controller/nova-consoleauth')

diff --git a/docker/common/nova-controller/nova-consoleauth/config-external.sh b/docker/common/nova-controller/nova-consoleauth/config-external.sh
new file mode 100755
index 000000000..1da10d83f
--- /dev/null
+++ b/docker/common/nova-controller/nova-consoleauth/config-external.sh
@@ -0,0 +1,10 @@
+#!/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
new file mode 100755
index 000000000..a1b0864ac
--- /dev/null
+++ b/docker/common/nova-controller/nova-consoleauth/config-internal.sh
@@ -0,0 +1,11 @@
+#!/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
index a1b0864ac..88f1b7a6b 100755
--- a/docker/common/nova-controller/nova-consoleauth/start.sh
+++ b/docker/common/nova-controller/nova-consoleauth/start.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
-set -e
+set -o errexit
 
-. /opt/kolla/config-nova.sh
+CMD="/usr/bin/nova-consoleauth"
+ARGS=""
 
-cfg=/etc/nova/nova.conf
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
 
-crudini --set $cfg DEFAULT log_file "${NOVA_CONSOLEAUTH_LOG_FILE}"
+# Config-internal script exec out of this function, it does not return here.
+set_configs
 
-echo Starting nova-consoleauth
-exec /usr/bin/nova-consoleauth
+exec $CMD $ARGS
-- 
cgit v1.2.3