diff --git a/docker/neutron/neutron-base/config-neutron.sh b/docker/neutron/neutron-base/config-neutron.sh index 9d88af35e2..18f5ffc968 100644 --- a/docker/neutron/neutron-base/config-neutron.sh +++ b/docker/neutron/neutron-base/config-neutron.sh @@ -30,9 +30,8 @@ set -e # Paste configuration file : ${API_PASTE_CONFIG:=/usr/share/neutron/api-paste.ini} -check_required_vars NEUTRON_KEYSTONE_PASSWORD NEUTRON_LOG_DIR \ - KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST \ - NEUTRON_API_PASTE_CONFIG +check_required_vars NEUTRON_KEYSTONE_PASSWORD NEUTRON_API_PASTE_CONFIG \ + KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST core_cfg=/etc/neutron/neutron.conf ml2_cfg=/etc/neutron/plugins/ml2/ml2_conf.ini diff --git a/docker/neutron/neutron-server/start.sh b/docker/neutron/neutron-server/start.sh index 0a2b81872b..23ff63a87e 100755 --- a/docker/neutron/neutron-server/start.sh +++ b/docker/neutron/neutron-server/start.sh @@ -13,8 +13,7 @@ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ NEUTRON_DB_NAME NEUTRON_DB_USER NEUTRON_DB_PASSWORD \ NEUTRON_KEYSTONE_USER NEUTRON_KEYSTONE_PASSWORD \ 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_db diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index f8a9c44a5c..2912d0b588 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -20,7 +20,7 @@ check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \ RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ KEYSTONE_PUBLIC_SERVICE_HOST PUBLIC_IP \ PUBLIC_INTERFACE FLAT_INTERFACE DEBUG_LOGGING \ - VERBOSE_LOGGING NOVA_LOG_DIR + VERBOSE_LOGGING cfg=/etc/nova/nova.conf diff --git a/docker/nova-compute/nova-compute/config-nova-compute.sh b/docker/nova-compute/nova-compute/config-nova-compute.sh index 62e40701f6..6235e5426e 100755 --- a/docker/nova-compute/nova-compute/config-nova-compute.sh +++ b/docker/nova-compute/nova-compute/config-nova-compute.sh @@ -5,8 +5,6 @@ cfg=/etc/nova/nova.conf -check_required_vars NOVA_COMPUTE_LOG_FILE - # configure logging crudini --set $cfg DEFAULT log_file "${NOVA_COMPUTE_LOG_FILE}" diff --git a/docker/nova-compute/nova-network/config-nova-network.sh b/docker/nova-compute/nova-network/config-nova-network.sh index 05013bde23..f8e036fdac 100755 --- a/docker/nova-compute/nova-network/config-nova-network.sh +++ b/docker/nova-compute/nova-network/config-nova-network.sh @@ -2,8 +2,6 @@ . /opt/kolla/config-nova.sh -check_required_vars NOVA_NETWORK_LOG_FILE - cfg=/etc/nova/nova.conf # configure logging diff --git a/docker/nova-controller/nova-api/start.sh b/docker/nova-controller/nova-api/start.sh index eab97474ce..5f615ed50f 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 a1b5957e8c..fa4bbd69a1 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 5be5e4e80b..bd093d01cc 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