openstack/kolla-ansible
Code Issues Proposed changes

Add more checks to the glance containers

Browse Source 
The glance containers need to check for more required variables
than they were originally.

Closes-bug: #1432336
Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>

Change-Id: I8fc730580f09ed3d4c54b8e94d011f0f924cae3e
This commit is contained in:
Ryan Hallisey 2015-06-24 12:52:52 -04:00 committed by Steven Dake
parent f945d648bd
commit 29a9515365
4 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/common/glance/glance-api/start.sh
View File

@ -4,12 +4,13 @@ set -e
. /opt/kolla/kolla-common.sh . /opt/kolla/kolla-common.sh
. /opt/kolla/config-glance.sh . /opt/kolla/config-glance.sh
: ${GLANCE_API_SERVICE_HOST:=$PUBLIC_IP}
check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \ check_required_vars ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \
GLANCE_KEYSTONE_USER GLANCE_KEYSTONE_PASSWORD \ GLANCE_KEYSTONE_PASSWORD GLANCE_KEYSTONE_USER \
ADMIN_TENANT_NAME GLANCE_API_SERVICE_HOST \ GLANCE_REGISTRY_SERVICE_HOST KEYSTONE_ADMIN_SERVICE_HOST \
PUBLIC_IP KEYSTONE_ADMIN_SERVICE_PORT KEYSTONE_ADMIN_TOKEN \
KEYSTONE_AUTH_PROTOCOL PUBLIC_IP \
RABBITMQ_SERVICE_HOST
fail_unless_os_service_running keystone fail_unless_os_service_running keystone

6
docker/common/glance/glance-base/config-glance.sh
View File

@ -11,7 +11,11 @@ set -e
: ${KEYSTONE_AUTH_PROTOCOL:=http} : ${KEYSTONE_AUTH_PROTOCOL:=http}
: ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR} : ${PUBLIC_IP:=$GLANCE_API_PORT_9292_TCP_ADDR}
check_required_vars GLANCE_DB_PASSWORD GLANCE_KEYSTONE_PASSWORD
check_required_vars ADMIN_TENANT_NAME GLANCE_DB_NAME GLANCE_DB_PASSWORD \
GLANCE_DB_USER GLANCE_KEYSTONE_PASSWORD \
GLANCE_KEYSTONE_USER KEYSTONE_PUBLIC_SERVICE_HOST \
MARIADB_SERVICE_HOST
dump_vars dump_vars
cat > /openrc <<EOF cat > /openrc <<EOF

6
docker/common/glance/glance-registry/start.sh
View File

@ -5,8 +5,10 @@ set -e
. /opt/kolla/kolla-common.sh . /opt/kolla/kolla-common.sh
. /opt/kolla/config-glance.sh . /opt/kolla/config-glance.sh
check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD \
INIT_GLANCE_DB check_required_vars DB_ROOT_PASSWORD GLANCE_DB_NAME \
GLANCE_DB_PASSWORD GLANCE_DB_USER \
MARIADB_SERVICE_HOST
# lets wait for the DB to be available # lets wait for the DB to be available
wait_for 25 1 check_for_db wait_for 25 1 check_for_db

24
docs/minimal-environment-vars.md
View File

@ -208,25 +208,37 @@ In order for each service to function, there is a minimum set of required variab
# Glance-api # Glance-api
KEYSTONE_ADMIN_TOKEN
KEYSTONE_ADMIN_SERVICE_HOST
GLANCE_KEYSTONE_USER
GLANCE_KEYSTONE_PASSWORD
ADMIN_TENANT_NAME ADMIN_TENANT_NAME
GLANCE_API_SERVICE_HOST GLANCE_API_SERVICE_HOST
GLANCE_KEYSTONE_PASSWORD
GLANCE_KEYSTONE_USER
GLANCE_REGISTRY_SERVICE_HOST
KEYSTONE_ADMIN_SERVICE_HOST
KEYSTONE_ADMIN_SERVICE_PORT
KEYSTONE_ADMIN_TOKEN
KEYSTONE_AUTH_PROTOCOL
PUBLIC_IP PUBLIC_IP
RABBITMQ_SERVICE_HOST
# Glance-base # Glance-base
ADMIN_TENANT_NAME
GLANCE_DB_PASSWORD GLANCE_DB_PASSWORD
GLANCE_DB_NAME
GLANCE_DB_PASSWORD
GLANCE_DB_USER
GLANCE_KEYSTONE_PASSWORD GLANCE_KEYSTONE_PASSWORD
GLANCE_KEYSTONE_USER
KEYSTONE_PUBLIC_SERVICE_HOST
MARIADB_SERVICE_HOST
# Glance-registry # Glance-registry
DB_ROOT_PASSWORD
GLANCE_DB_NAME GLANCE_DB_NAME
GLANCE_DB_USER
GLANCE_DB_PASSWORD GLANCE_DB_PASSWORD
INIT_GLANCE_DB GLANCE_DB_USER
MARIADB_SERVICE_HOST
# Hautoproxy # Hautoproxy