diff options
Diffstat (limited to 'docker/common/nova')
| -rwxr-xr-x | docker/common/nova/nova-api/config-internal.sh | 13 | ||||
| -rwxr-xr-x | docker/common/nova/nova-base/config-nova.sh | 27 | ||||
| -rwxr-xr-x | docker/common/nova/nova-conductor/config-internal.sh | 6 | ||||
| -rwxr-xr-x | docker/common/nova/nova-novncproxy/config-internal.sh | 9 |
4 files changed, 28 insertions, 27 deletions
diff --git a/docker/common/nova/nova-api/config-internal.sh b/docker/common/nova/nova-api/config-internal.sh index 7928370a4..86768a60d 100755 --- a/docker/common/nova/nova-api/config-internal.sh +++ b/docker/common/nova/nova-api/config-internal.sh @@ -4,10 +4,15 @@ set -e . /opt/kolla/config-nova.sh -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 +check_required_vars ADMIN_TENANT_NAME \ + KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_TOKEN \ + NOVA_API_SERVICE_HOST \ + NOVA_DB_NAME \ + NOVA_EC2_API_SERVICE_HOST \ + NOVA_KEYSTONE_PASSWORD \ + NOVA_KEYSTONE_USER \ + PUBLIC_IP fail_unless_os_service_running keystone fail_unless_db $NOVA_DB_NAME diff --git a/docker/common/nova/nova-base/config-nova.sh b/docker/common/nova/nova-base/config-nova.sh index 8789a14a5..6465d48a2 100755 --- a/docker/common/nova/nova-base/config-nova.sh +++ b/docker/common/nova/nova-base/config-nova.sh @@ -2,24 +2,15 @@ . /opt/kolla/kolla-common.sh -: ${NOVA_DB_USER:=nova} -: ${NOVA_DB_NAME:=nova} -: ${NOVA_KEYSTONE_USER:=admin} -: ${NOVA_KEYSTONE_PASSWORD:=kolla} -: ${ADMIN_TENANT_NAME:=admin} -: ${RABBIT_USERID:=guest} -: ${RABBIT_PASSWORD:=guest} -: ${NETWORK_MANAGER:=nova} -: ${FLAT_NETWORK:=eth1} -: ${PUBLIC_NETWORK:=eth0} -: ${ENABLED_APIS:=ec2,osapi_compute,metadata} -: ${METADATA_HOST:=$PUBLIC_IP} -: ${NEUTRON_SHARED_SECRET:=sharedsecret} - -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 \ +check_required_vars DEBUG_LOGGING \ + FLAT_INTERFACE \ + GLANCE_API_SERVICE_HOST \ + KEYSTONE_ADMIN_TOKEN \ + KEYSTONE_PUBLIC_SERVICE_HOST \ + NOVA_DB_PASSWORD \ + PUBLIC_INTERFACE \ + PUBLIC_IP \ + RABBITMQ_SERVICE_HOST \ VERBOSE_LOGGING cfg=/etc/nova/nova.conf diff --git a/docker/common/nova/nova-conductor/config-internal.sh b/docker/common/nova/nova-conductor/config-internal.sh index 3bba8cf3a..e242b4db5 100755 --- a/docker/common/nova/nova-conductor/config-internal.sh +++ b/docker/common/nova/nova-conductor/config-internal.sh @@ -4,8 +4,10 @@ set -e . /opt/kolla/config-nova.sh -check_required_vars NOVA_DB_NAME NOVA_DB_USER NOVA_DB_PASSWORD \ - INIT_NOVA_DB +check_required_vars INIT_NOVA_DB \ + NOVA_DB_NAME \ + NOVA_DB_PASSWORD \ + NOVA_DB_USER fail_unless_db cfg=/etc/nova/nova.conf diff --git a/docker/common/nova/nova-novncproxy/config-internal.sh b/docker/common/nova/nova-novncproxy/config-internal.sh index 9edafbca3..6ddea5a76 100755 --- a/docker/common/nova/nova-novncproxy/config-internal.sh +++ b/docker/common/nova/nova-novncproxy/config-internal.sh @@ -4,9 +4,12 @@ set -e cfg=/etc/nova/nova.conf -check_required_vars PUBLIC_IP NOVA_NOVNC_PROXY_SERVICE_HOST NOVA_NOVNC_PROXY_PORT \ - NOVA_NOVNC_BASE_ADDRESS NOVA_VNCSERVER_LISTEN_ADDRESS \ - NOVA_VNCSERVER_PROXYCLIENT_ADDRESS +check_required_vars NOVA_NOVNC_BASE_ADDRESS \ + NOVA_NOVNC_PROXY_PORT \ + NOVA_NOVNC_PROXY_SERVICE_HOST \ + NOVA_VNCSERVER_LISTEN_ADDRESS \ + NOVA_VNCSERVER_PROXYCLIENT_ADDRESS \ + PUBLIC_IP crudini --set $cfg DEFAULT log_file "${NOVA_NOVNCPROXY_LOG_FILE}" |
