From 7bab87f8ccbf7984ea217284187adb55f2a18c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Mon, 1 Dec 2014 17:20:04 +0900 Subject: [PATCH] Cleanup variable checks in glance-registry/start.sh Remove redundant checks for MARIADB_SERVICE_HOST and DB_ROOT_PASSWORD that are performed in `check_for_db`, and add missing check for GLANCE_DB_USER. Change-Id: Ie8194ce76274a9356dcc0b51353873d8a632c66a --- docker/glance/glance-registry/start.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh index 19be794811..5521d5b7e1 100755 --- a/docker/glance/glance-registry/start.sh +++ b/docker/glance/glance-registry/start.sh @@ -5,8 +5,7 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-glance.sh -check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD \ - GLANCE_DB_NAME GLANCE_DB_PASSWORD +check_required_vars GLANCE_DB_NAME GLANCE_DB_USER GLANCE_DB_PASSWORD check_for_db mysql -h ${MARIADB_SERVICE_HOST} -u root -p${DB_ROOT_PASSWORD} mysql <