aboutsummaryrefslogtreecommitdiff
path: root/docker/nova-compute
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-05-02 09:14:01 -0700
committerSteven Dake <stdake@cisco.com>2015-05-06 13:54:04 -0700
commit747f80e9281ca777dd5ab3de8d3aaf7f33f022c9 (patch)
tree48800258aeb27f1e41b282911cb6c7cd96048557 /docker/nova-compute
parentc81b00330925d5e3f0e7ae2c2ae41c6dc8f295c1 (diff)
downloadkolla-747f80e9281ca777dd5ab3de8d3aaf7f33f022c9.tar.gz
kolla-747f80e9281ca777dd5ab3de8d3aaf7f33f022c9.zip
Make nova read config files for Kilo
In Kilo, nova no longer reads the config files automatically. They must be specified in the command line to run the nova-* tools. Change-Id: Ifbdf4fd3f952f7bb65e9937b46cf9b96e262c3b0 Paritally-Impleents: blueprint port-kilo
Diffstat (limited to 'docker/nova-compute')
-rwxr-xr-xdocker/nova-compute/nova-compute/start.sh2
-rwxr-xr-xdocker/nova-compute/nova-network/start.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova-compute/nova-compute/start.sh b/docker/nova-compute/nova-compute/start.sh
index bafe37add..ce3d0c0c3 100755
--- a/docker/nova-compute/nova-compute/start.sh
+++ b/docker/nova-compute/nova-compute/start.sh
@@ -7,4 +7,4 @@ set -e
sleep 6
echo "Starting nova-compute."
-exec /usr/bin/nova-compute
+exec /usr/bin/nova-compute --config-file /etc/nova/nova.conf
diff --git a/docker/nova-compute/nova-network/start.sh b/docker/nova-compute/nova-network/start.sh
index b39a18ceb..92381b720 100755
--- a/docker/nova-compute/nova-network/start.sh
+++ b/docker/nova-compute/nova-network/start.sh
@@ -5,4 +5,4 @@ set -e
. /opt/kolla/config-nova-network.sh
# Start nova-network
-exec /usr/bin/nova-network
+exec /usr/bin/nova-network --config-file /etc/nova/nova.conf