summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorLars Kellogg-Stedman <lars@redhat.com>2014-10-17 15:46:49 -0400
committerLars Kellogg-Stedman <lars@redhat.com>2014-10-17 15:46:49 -0400
commit89534f43a1a9b29707d8ac62a23e3c28226f9cf5 (patch)
tree2ab6ae373d72989b0cced099fb7e291631a987db /docker
parentad615338cc141105253f772315a5905a86c91a42 (diff)
downloadkolla-89534f43a1a9b29707d8ac62a23e3c28226f9cf5.tar.gz
kolla-89534f43a1a9b29707d8ac62a23e3c28226f9cf5.zip
fix script name in nova-controller images
Change-Id: Ia0b9057887bf34423546ca36346d9253ef4c90b9
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/nova-controller/nova-api/start.sh2
-rwxr-xr-xdocker/nova-controller/nova-conductor/start.sh2
-rwxr-xr-xdocker/nova-controller/nova-scheduler/start.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh
index eca024204..2feeeea05 100755
--- a/docker/nova-controller/nova-api/start.sh
+++ b/docker/nova-controller/nova-api/start.sh
@@ -2,7 +2,7 @@
set -e
-. /opt/kolla/config-nova-controller.sh
+. /opt/kolla/config-nova.sh
check_for_keystone
diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh
index fdb79f7fd..4053a27ff 100755
--- a/docker/nova-controller/nova-conductor/start.sh
+++ b/docker/nova-controller/nova-conductor/start.sh
@@ -2,7 +2,7 @@
set -e
-. /opt/kolla/config-nova-controller.sh
+. /opt/kolla/config-nova.sh
check_for_db
diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh
index af5c8c338..71dd848f7 100755
--- a/docker/nova-controller/nova-scheduler/start.sh
+++ b/docker/nova-controller/nova-scheduler/start.sh
@@ -2,6 +2,6 @@
set -e
-. /opt/kolla/config-nova-controller.sh
+. /opt/kolla/config-nova.sh
exec /usr/bin/nova-scheduler