diff options
| author | Steven Dake <stdake@cisco.com> | 2015-05-02 09:14:01 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-05-06 13:54:04 -0700 |
| commit | 747f80e9281ca777dd5ab3de8d3aaf7f33f022c9 (patch) | |
| tree | 48800258aeb27f1e41b282911cb6c7cd96048557 /docker | |
| parent | c81b00330925d5e3f0e7ae2c2ae41c6dc8f295c1 (diff) | |
| download | kolla-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')
| -rwxr-xr-x | docker/nova-compute/nova-compute/start.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-compute/nova-network/start.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-api/start.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-conductor/start.sh | 2 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-scheduler/start.sh | 2 |
5 files changed, 5 insertions, 5 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 diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index aedea15f2..7928370a4 100755 --- a/docker/nova-controller/nova-api/start.sh +++ b/docker/nova-controller/nova-api/start.sh @@ -43,4 +43,4 @@ crux endpoint-create --remove-all \ -P "http://${PUBLIC_IP}:8774/v3" \ -A "http://${NOVA_API_SERVICE_HOST}:8774/v3" -exec /usr/bin/nova-api +exec /usr/bin/nova-api --config-file /etc/nova/nova.conf diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh index aa6a75ac3..5e01b7f30 100755 --- a/docker/nova-controller/nova-conductor/start.sh +++ b/docker/nova-controller/nova-conductor/start.sh @@ -21,4 +21,4 @@ EOF nova-manage db sync -exec /usr/bin/nova-conductor +exec /usr/bin/nova-conductor --config-file /etc/nova/nova.conf diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh index f386393dc..504c049ed 100755 --- a/docker/nova-controller/nova-scheduler/start.sh +++ b/docker/nova-controller/nova-scheduler/start.sh @@ -12,4 +12,4 @@ cfg=/etc/nova/nova.conf # configure logging crudini --set $cfg DEFAULT log_file "${NOVA_SCHEDULER_LOG_FILE}" -exec /usr/bin/nova-scheduler +exec /usr/bin/nova-scheduler --config-file /etc/nova/nova.conf |