summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-16 20:47:25 +0000
committerGerrit Code Review <review@openstack.org>2014-10-16 20:47:25 +0000
commit6b7cf4506a8af089ed047c56242aae66c3870432 (patch)
tree21896544b271ae0a0437a713d3bde7f5fa7da2c8 /docker
parent2ab124bac0d0cb26827ff0b4e0dbebd85b96a59f (diff)
parent3dd283939470efe914376c1be6fb39e416bfb083 (diff)
downloadkolla-6b7cf4506a8af089ed047c56242aae66c3870432.tar.gz
kolla-6b7cf4506a8af089ed047c56242aae66c3870432.zip
Merge "Wrong shell script specified in start.sh"
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/nova-controller/nova-api/start.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh
index f2419549f..0961f03eb 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.sh
+. /opt/kolla/config-nova-controller.sh
check_for_keystone