aboutsummaryrefslogtreecommitdiff
path: root/docker/common/nova-compute/nova-network
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-04 19:56:48 +0000
committerGerrit Code Review <review@openstack.org>2015-07-04 19:56:48 +0000
commit15b60a1f8d84859c116bcaa3422902b09bcee779 (patch)
treec7da2bf6ec0c77955af88356972c3c18111e1a93 /docker/common/nova-compute/nova-network
parent8af47bf957b6f226f720f5ce289cb28b6e5ceafa (diff)
parent0de08336754cbff67d320fcf5d68ad97243f96ec (diff)
downloadkolla-15b60a1f8d84859c116bcaa3422902b09bcee779.tar.gz
kolla-15b60a1f8d84859c116bcaa3422902b09bcee779.zip
Merge "Add config-internal/config-external to Nova-compute containers"
Diffstat (limited to 'docker/common/nova-compute/nova-network')
-rwxr-xr-xdocker/common/nova-compute/nova-network/config-external.sh10
-rwxr-xr-xdocker/common/nova-compute/nova-network/config-internal.sh8
-rwxr-xr-xdocker/common/nova-compute/nova-network/start.sh13
3 files changed, 27 insertions, 4 deletions
diff --git a/docker/common/nova-compute/nova-network/config-external.sh b/docker/common/nova-compute/nova-network/config-external.sh
new file mode 100755
index 000000000..7c1d6bb37
--- /dev/null
+++ b/docker/common/nova-compute/nova-network/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/nova-network/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-compute/nova-network/config-internal.sh b/docker/common/nova-compute/nova-network/config-internal.sh
new file mode 100755
index 000000000..92381b720
--- /dev/null
+++ b/docker/common/nova-compute/nova-network/config-internal.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+. /opt/kolla/config-nova-network.sh
+
+# Start nova-network
+exec /usr/bin/nova-network --config-file /etc/nova/nova.conf
diff --git a/docker/common/nova-compute/nova-network/start.sh b/docker/common/nova-compute/nova-network/start.sh
index 92381b720..b6faa8215 100755
--- a/docker/common/nova-compute/nova-network/start.sh
+++ b/docker/common/nova-compute/nova-network/start.sh
@@ -1,8 +1,13 @@
#!/bin/bash
+set -o errexit
-set -e
+CMD="/usr/bin/nova-network"
+ARGS=""
-. /opt/kolla/config-nova-network.sh
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
-# Start nova-network
-exec /usr/bin/nova-network --config-file /etc/nova/nova.conf
+# Config-internal script exec out of this function, it does not return here.
+set_configs
+
+exec $CMD $ARGS