openstack/kolla
Code Issues Proposed changes

Removes check_required_vars for Log Files

Browse Source 
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
This commit is contained in:
Daneyon Hansen 2015-04-10 06:16:46 +00:00
parent fa789ab8ba
commit 882a859ff5
8 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/neutron/neutron-base/config-neutron.sh
View File

@ -30,9 +30,8 @@ set -e
# Paste configuration file # Paste configuration file
: ${API_PASTE_CONFIG:=/usr/share/neutron/api-paste.ini} : ${API_PASTE_CONFIG:=/usr/share/neutron/api-paste.ini}
check_required_vars NEUTRON_KEYSTONE_PASSWORD NEUTRON_LOG_DIR \ check_required_vars NEUTRON_KEYSTONE_PASSWORD NEUTRON_API_PASTE_CONFIG \
KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST \ KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST
NEUTRON_API_PASTE_CONFIG
core_cfg=/etc/neutron/neutron.conf core_cfg=/etc/neutron/neutron.conf
ml2_cfg=/etc/neutron/plugins/ml2/ml2_conf.ini ml2_cfg=/etc/neutron/plugins/ml2/ml2_conf.ini

3
docker/neutron/neutron-server/start.sh
View File

@ -13,8 +13,7 @@ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
NEUTRON_DB_NAME NEUTRON_DB_USER NEUTRON_DB_PASSWORD \ NEUTRON_DB_NAME NEUTRON_DB_USER NEUTRON_DB_PASSWORD \
NEUTRON_KEYSTONE_USER NEUTRON_KEYSTONE_PASSWORD \ NEUTRON_KEYSTONE_USER NEUTRON_KEYSTONE_PASSWORD \
ADMIN_TENANT_NAME NEUTRON_SERVER_SERVICE_HOST \ ADMIN_TENANT_NAME NEUTRON_SERVER_SERVICE_HOST \
PUBLIC_IP NEUTRON_DB_PASSWORD NEUTRON_SERVER_LOG_FILE PUBLIC_IP NEUTRON_DB_PASSWORD
fail_unless_os_service_running keystone fail_unless_os_service_running keystone
fail_unless_db fail_unless_db

2
docker/nova-base/config-nova.sh
View File

@ -20,7 +20,7 @@ check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \
RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \
KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP \ KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP \
PUBLIC_INTERFACE FLAT_INTERFACE DEBUG_LOGGING \ PUBLIC_INTERFACE FLAT_INTERFACE DEBUG_LOGGING \
VERBOSE_LOGGING NOVA_LOG_DIR VERBOSE_LOGGING
cfg=/etc/nova/nova.conf cfg=/etc/nova/nova.conf

2
docker/nova-compute/nova-compute/config-nova-compute.sh
View File

@ -5,8 +5,6 @@
cfg=/etc/nova/nova.conf cfg=/etc/nova/nova.conf
check_required_vars NOVA_COMPUTE_LOG_FILE
# configure logging # configure logging
crudini --set $cfg DEFAULT log_file "${NOVA_COMPUTE_LOG_FILE}" crudini --set $cfg DEFAULT log_file "${NOVA_COMPUTE_LOG_FILE}"

2
docker/nova-compute/nova-network/config-nova-network.sh
View File

@ -2,8 +2,6 @@
. /opt/kolla/config-nova.sh . /opt/kolla/config-nova.sh
check_required_vars NOVA_NETWORK_LOG_FILE
cfg=/etc/nova/nova.conf cfg=/etc/nova/nova.conf
# configure logging # configure logging

3
docker/nova-controller/nova-api/start.sh
View File

@ -7,8 +7,7 @@ set -e
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \ NOVA_KEYSTONE_USER NOVA_KEYSTONE_PASSWORD \
ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \ ADMIN_TENANT_NAME NOVA_API_SERVICE_HOST \
NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME \ NOVA_EC2_API_SERVICE_HOST PUBLIC_IP NOVA_DB_NAME
NOVA_API_LOG_FILE
fail_unless_os_service_running keystone fail_unless_os_service_running keystone
fail_unless_db $NOVA_DB_NAME fail_unless_db $NOVA_DB_NAME

3
docker/nova-controller/nova-conductor/start.sh
View File

@ -4,8 +4,7 @@ set -e
. /opt/kolla/config-nova.sh . /opt/kolla/config-nova.sh
check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \ check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD
NOVA_CONDUCTOR_LOG_FILE
fail_unless_db fail_unless_db
cfg=/etc/nova/nova.conf cfg=/etc/nova/nova.conf

2
docker/nova-controller/nova-scheduler/start.sh
View File

@ -4,7 +4,7 @@ set -e
. /opt/kolla/config-nova.sh . /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 fail_unless_db $NOVA_DB_NAME
cfg=/etc/nova/nova.conf cfg=/etc/nova/nova.conf