diff options
| author | Ryan Hallisey <rhallise@redhat.com> | 2015-06-26 09:32:46 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-06-26 09:32:46 -0400 |
| commit | d3e91294a38cb62a47a9406a12b15f66caa1e3ef (patch) | |
| tree | 4eaec786c4cd6162abd774efdd8965d762c41934 /docker | |
| parent | 258d6ae3f3c8976fff9235dd229dff58cf1eb0f9 (diff) | |
| download | kolla-d3e91294a38cb62a47a9406a12b15f66caa1e3ef.tar.gz kolla-d3e91294a38cb62a47a9406a12b15f66caa1e3ef.zip | |
Remove log files from required vars in Cinder
The log dir and files are being set to nothing and they
were being required by Cinder causing the check to fail.
The log dir and files are not required to run Cinder so
they need to be removed.
Change-Id: I523481f5e3c51a05294fc5e13caaff0a95626f13
Closes-bug: #1468996
Diffstat (limited to 'docker')
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 |