diff options
| author | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-20 11:05:18 +0000 |
|---|---|---|
| committer | Swapnil Kulkarni <me@coolsvap.net> | 2015-07-29 18:08:50 +0000 |
| commit | 1c147e4def0605e64a41916b71a9f2e675a0cbcf (patch) | |
| tree | 11ec1e7ffbc134ee5c9feed4cecfaca0588a2acc /docker/common/nova/nova-base | |
| parent | 9f3b2ddf173bcab10cf6516702fce690c11431cf (diff) | |
| download | kolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.tar.gz kolla-1c147e4def0605e64a41916b71a9f2e675a0cbcf.zip | |
Update service helper scripts for variable changes
- Updated the required variables to be sorted so
that they are better visible one on each line
- Removed variable defaults from each service scripts
and added them to tools/genenv file which holds
all default values
Change-Id: Ia7b1b08ba3f963b46b81434ce84f476d56890a93
Closes-Bug: #1476494
Closes-Bug: #1467652
Diffstat (limited to 'docker/common/nova/nova-base')
| -rwxr-xr-x | docker/common/nova/nova-base/config-nova.sh | 27 |
1 files changed, 9 insertions, 18 deletions
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 |