diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-26 17:41:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-26 17:41:50 +0000 |
| commit | 370343e329aee9e68fb6e2c0c872d60a72ac3832 (patch) | |
| tree | 7e7630542348691d4844c9202f58d3726b433961 | |
| parent | 90bf4c564546f48219996942f814ca4cde8ce36c (diff) | |
| parent | d3e91294a38cb62a47a9406a12b15f66caa1e3ef (diff) | |
| download | kolla-370343e329aee9e68fb6e2c0c872d60a72ac3832.tar.gz kolla-370343e329aee9e68fb6e2c0c872d60a72ac3832.zip | |
Merge "Remove log files from required vars in Cinder"
4 files changed, 4 insertions, 5 deletions
diff --git a/docker/common/cinder-app/cinder-api/start.sh b/docker/common/cinder-app/cinder-api/start.sh index 28293ac6c..860308e62 100755 --- a/docker/common/cinder-app/cinder-api/start.sh +++ b/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 \ KEYSTONE_AUTH_PROTOCOL KEYSTONE_ADMIN_SERVICE_PORT \ CINDER_KEYSTONE_USER CINDER_KEYSTONE_PASSWORD \ - CINDER_API_LOG_FILE CINDER_API_SERVICE_LISTEN \ - CINDER_API_SERVICE_PORT CINDER_API_SERVICE_LISTEN + CINDER_API_SERVICE_LISTEN CINDER_API_SERVICE_PORT fail_unless_os_service_running keystone diff --git a/docker/common/cinder-app/cinder-base/config-cinder.sh b/docker/common/cinder-app/cinder-base/config-cinder.sh index f82cb5510..37a5f2a4b 100644 --- a/docker/common/cinder-app/cinder-base/config-cinder.sh +++ b/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 \ GLANCE_API_SERVICE_PORT ADMIN_TENANT_NAME \ CINDER_DB_NAME CINDER_DB_USER CINDER_KEYSTONE_USER \ - PUBLIC_IP KEYSTONE_AUTH_PROTOCOL CINDER_LOG_DIR + PUBLIC_IP KEYSTONE_AUTH_PROTOCOL dump_vars diff --git a/docker/common/cinder-app/cinder-scheduler/start.sh b/docker/common/cinder-app/cinder-scheduler/start.sh index 93efeb406..54df77983 100755 --- a/docker/common/cinder-app/cinder-scheduler/start.sh +++ b/docker/common/cinder-app/cinder-scheduler/start.sh @@ -9,7 +9,7 @@ fail_unless_db check_required_vars MARIADB_SERVICE_HOST DB_ROOT_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 diff --git a/docker/common/cinder-app/cinder-volume/start.sh b/docker/common/cinder-app/cinder-volume/start.sh index 26a0f6dcf..056197425 100755 --- a/docker/common/cinder-app/cinder-volume/start.sh +++ b/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 \ CINDER_VOLUME_GROUP CINDER_LVM_LO_VOLUME_SIZE \ CINDER_VOLUME_BACKEND_NAME CINDER_VOLUME_DRIVER \ - CINDER_ENABLED_BACKEND CINDER_VOLUME_LOG_FILE + CINDER_ENABLED_BACKEND cfg=/etc/cinder/cinder.conf |