openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove log files from required vars in Cinder"

Browse Source
This commit is contained in:
Jenkins 2015-06-26 17:41:50 +00:00 committed by Gerrit Code Review
commit 370343e329
4 changed files with 4 additions and 5 deletions
docker/common/cinder-app
cinder-api
start.sh
cinder-base
config-cinder.sh
cinder-scheduler
start.sh
cinder-volume
start.sh

3
docker/common/cinder-app/cinder-api/start.sh

@ -9,8 +9,7 @@ check_required_vars KEYSTONE_ADMIN_TOKEN KEYSTONE_ADMIN_SERVICE_HOST \
ADMIN_TENANT_NAME PUBLIC_IP CINDER_API_SERVICE_HOST \ ADMIN_TENANT_NAME PUBLIC_IP CINDER_API_SERVICE_HOST \
KEYSTONE_AUTH_PROTOCOL KEYSTONE_ADMIN_SERVICE_PORT \ KEYSTONE_AUTH_PROTOCOL KEYSTONE_ADMIN_SERVICE_PORT \
CINDER_KEYSTONE_USER CINDER_KEYSTONE_PASSWORD \ CINDER_KEYSTONE_USER CINDER_KEYSTONE_PASSWORD \
CINDER_API_LOG_FILE CINDER_API_SERVICE_LISTEN \ CINDER_API_SERVICE_LISTEN CINDER_API_SERVICE_PORT
CINDER_API_SERVICE_PORT CINDER_API_SERVICE_LISTEN
fail_unless_os_service_running keystone fail_unless_os_service_running keystone

2
docker/common/cinder-app/cinder-base/config-cinder.sh

@ -11,7 +11,7 @@ check_required_vars CINDER_DB_PASSWORD CINDER_KEYSTONE_PASSWORD \
RABBIT_USERID RABBIT_PASSWORD GLANCE_API_SERVICE_HOST \ RABBIT_USERID RABBIT_PASSWORD GLANCE_API_SERVICE_HOST \
GLANCE_API_SERVICE_PORT ADMIN_TENANT_NAME \ GLANCE_API_SERVICE_PORT ADMIN_TENANT_NAME \
CINDER_DB_NAME CINDER_DB_USER CINDER_KEYSTONE_USER \ CINDER_DB_NAME CINDER_DB_USER CINDER_KEYSTONE_USER \
PUBLIC_IP KEYSTONE_AUTH_PROTOCOL CINDER_LOG_DIR PUBLIC_IP KEYSTONE_AUTH_PROTOCOL
dump_vars dump_vars

2
docker/common/cinder-app/cinder-scheduler/start.sh

@ -9,7 +9,7 @@ fail_unless_db
check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD \ check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD \
CINDER_DB_NAME CINDER_DB_USER CINDER_DB_PASSWORD \ CINDER_DB_NAME CINDER_DB_USER CINDER_DB_PASSWORD \
CINDER_SCHEDULER_LOG_FILE INIT_CINDER_DB INIT_CINDER_DB
cfg=/etc/cinder/cinder.conf cfg=/etc/cinder/cinder.conf

2
docker/common/cinder-app/cinder-volume/start.sh

@ -9,7 +9,7 @@ set -e
check_required_vars CINDER_VOLUME_API_LISTEN ISCSI_HELPER ISCSI_IP_ADDRESS \ check_required_vars CINDER_VOLUME_API_LISTEN ISCSI_HELPER ISCSI_IP_ADDRESS \
CINDER_VOLUME_GROUP CINDER_LVM_LO_VOLUME_SIZE \ CINDER_VOLUME_GROUP CINDER_LVM_LO_VOLUME_SIZE \
CINDER_VOLUME_BACKEND_NAME CINDER_VOLUME_DRIVER \ CINDER_VOLUME_BACKEND_NAME CINDER_VOLUME_DRIVER \
CINDER_ENABLED_BACKEND CINDER_VOLUME_LOG_FILE CINDER_ENABLED_BACKEND
cfg=/etc/cinder/cinder.conf cfg=/etc/cinder/cinder.conf