diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-04-10 06:16:46 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-13 17:17:52 +0000 |
| commit | 882a859ff5c7b699887b4b46c804faa02e8ac720 (patch) | |
| tree | 4484900438c3f618086aa8e2d1eb3bec31b41d39 /docker/nova-controller | |
| parent | fa789ab8babfd2612289a1e2b0bd00bbbc80a440 (diff) | |
| download | kolla-882a859ff5c7b699887b4b46c804faa02e8ac720.tar.gz kolla-882a859ff5c7b699887b4b46c804faa02e8ac720.zip | |
Removes check_required_vars for Log Files
Previously, check_required_vars was requiring log file variables
to be set in openstack.env. This would cause an error when
starting nova/neutron containers that used default (blank) log
file settings. Since the log files are not required
for the services to start, the default log files are left blank
(without a value in the K/V pair). This patch removes the
log_file variable for check_required_vars in each nova/neutron
script.
Change-Id: I169baab28f63a0e0ae06c8aef21b5e8d3155bdda
Diffstat (limited to 'docker/nova-controller')
| -rwxr-xr-x | docker/nova-controller/nova-api/start.sh | 3 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-conductor/start.sh | 3 | ||||
| -rwxr-xr-x | docker/nova-controller/nova-scheduler/start.sh | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index eab97474c..5f615ed50 100755 --- a/docker/nova-controller/nova-api/start.sh +++ b/docker/nova-controller/nova-api/start.sh @@ -7,8 +7,7 @@ set -e check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \ ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \ - NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME \ - NOVA_API_LOG_FILE + NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME fail_unless_os_service_running keystone fail_unless_db $NOVA_DB_NAME diff --git a/docker/nova-controller/nova-conductor/start.sh b/docker/nova-controller/nova-conductor/start.sh index a1b5957e8..fa4bbd69a 100755 --- a/docker/nova-controller/nova-conductor/start.sh +++ b/docker/nova-controller/nova-conductor/start.sh @@ -4,8 +4,7 @@ set -e . /opt/kolla/config-nova.sh -check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \ - NOVA_CONDUCTOR_LOG_FILE +check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD fail_unless_db cfg=/etc/nova/nova.conf diff --git a/docker/nova-controller/nova-scheduler/start.sh b/docker/nova-controller/nova-scheduler/start.sh index 5be5e4e80..bd093d01c 100755 --- a/docker/nova-controller/nova-scheduler/start.sh +++ b/docker/nova-controller/nova-scheduler/start.sh @@ -4,7 +4,7 @@ set -e . /opt/kolla/config-nova.sh -check_required_vars NOVA_DB_NAME NOVA_SCHEDULER_LOG_FILE +check_required_vars NOVA_DB_NAME fail_unless_db $NOVA_DB_NAME cfg=/etc/nova/nova.conf |