diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-30 18:54:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-30 18:54:43 +0000 |
| commit | 731d5205cbed74028bda0883a5432afc476605b6 (patch) | |
| tree | 38a04d3f8f1d817fc08931d23df29fff416c82ab /docker/common/cinder-app | |
| parent | 15eb390ab307885943280a4b5d1287dc580517aa (diff) | |
| parent | 1c147e4def0605e64a41916b71a9f2e675a0cbcf (diff) | |
| download | kolla-731d5205cbed74028bda0883a5432afc476605b6.tar.gz kolla-731d5205cbed74028bda0883a5432afc476605b6.zip | |
Merge "Update service helper scripts for variable changes"
Diffstat (limited to 'docker/common/cinder-app')
5 files changed, 47 insertions, 22 deletions
diff --git a/docker/common/cinder-app/cinder-api/config-internal.sh b/docker/common/cinder-app/cinder-api/config-internal.sh index 832d4f78a..158d1efe1 100755 --- a/docker/common/cinder-app/cinder-api/config-internal.sh +++ b/docker/common/cinder-app/cinder-api/config-internal.sh @@ -4,11 +4,17 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-cinder.sh -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_SERVICE_LISTEN CINDER_API_SERVICE_PORT +check_required_vars ADMIN_TENANT_NAME \ + CINDER_API_SERVICE_HOST \ + CINDER_API_SERVICE_LISTEN \ + CINDER_API_SERVICE_PORT \ + CINDER_KEYSTONE_PASSWORD \ + CINDER_KEYSTONE_USER \ + KEYSTONE_ADMIN_SERVICE_HOST \ + KEYSTONE_ADMIN_SERVICE_PORT \ + KEYSTONE_AUTH_PROTOCOL \ + KEYSTONE_ADMIN_TOKEN \ + PUBLIC_IP fail_unless_os_service_running keystone diff --git a/docker/common/cinder-app/cinder-backup/config-internal.sh b/docker/common/cinder-app/cinder-backup/config-internal.sh index 3227ddab2..bd1dda9fa 100755 --- a/docker/common/cinder-app/cinder-backup/config-internal.sh +++ b/docker/common/cinder-app/cinder-backup/config-internal.sh @@ -5,8 +5,10 @@ set -e . /opt/kolla/kolla-common.sh . /opt/kolla/config-cinder.sh -check_required_vars CINDER_BACKUP_DRIVER CINDER_BACKUP_MANAGER \ - CINDER_BACKUP_API_CLASS CINDER_BACKUP_NAME_TEMPLATE +check_required_vars CINDER_BACKUP_API_CLASS \ + CINDER_BACKUP_MANAGER \ + CINDER_BACKUP_NAME_TEMPLATE \ + CINDER_BACKUP_DRIVER cfg=/etc/cinder/cinder.conf diff --git a/docker/common/cinder-app/cinder-base/config-cinder.sh b/docker/common/cinder-app/cinder-base/config-cinder.sh index 5de11a993..a49b17f07 100755 --- a/docker/common/cinder-app/cinder-base/config-cinder.sh +++ b/docker/common/cinder-app/cinder-base/config-cinder.sh @@ -4,14 +4,24 @@ set -e . /opt/kolla/kolla-common.sh -check_required_vars CINDER_DB_PASSWORD CINDER_KEYSTONE_PASSWORD \ - KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST \ - GLANCE_API_SERVICE_HOST MARIADB_SERVICE_HOST \ - RABBITMQ_SERVICE_HOST RABBITMQ_SERVICE_PORT \ - 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_API_VERSION +check_required_vars ADMIN_TENANT_NAME \ + CINDER_API_VERSION \ + CINDER_DB_NAME \ + CINDER_DB_PASSWORD \ + CINDER_DB_USER \ + CINDER_KEYSTONE_PASSWORD \ + CINDER_KEYSTONE_USER \ + GLANCE_API_SERVICE_HOST \ + GLANCE_API_SERVICE_PORT \ + KEYSTONE_AUTH_PROTOCOL \ + KEYSTONE_PUBLIC_SERVICE_HOST \ + MARIADB_SERVICE_HOST \ + PUBLIC_IP \ + RABBITMQ_SERVICE_HOST \ + RABBITMQ_SERVICE_HOST \ + RABBITMQ_SERVICE_PORT \ + RABBIT_PASSWORD \ + RABBIT_USERID dump_vars diff --git a/docker/common/cinder-app/cinder-scheduler/config-internal.sh b/docker/common/cinder-app/cinder-scheduler/config-internal.sh index 54df77983..e39d15298 100755 --- a/docker/common/cinder-app/cinder-scheduler/config-internal.sh +++ b/docker/common/cinder-app/cinder-scheduler/config-internal.sh @@ -7,9 +7,12 @@ set -e fail_unless_db -check_required_vars MARIADB_SERVICE_HOST DB_ROOT_PASSWORD \ - CINDER_DB_NAME CINDER_DB_USER CINDER_DB_PASSWORD \ - INIT_CINDER_DB +check_required_vars CINDER_DB_NAME \ + CINDER_DB_PASSWORD \ + CINDER_DB_USER \ + DB_ROOT_PASSWORD \ + INIT_CINDER_DB \ + MARIADB_SERVICE_HOST cfg=/etc/cinder/cinder.conf diff --git a/docker/common/cinder-app/cinder-volume/config-internal.sh b/docker/common/cinder-app/cinder-volume/config-internal.sh index 0b0d9b95c..79a813e9c 100755 --- a/docker/common/cinder-app/cinder-volume/config-internal.sh +++ b/docker/common/cinder-app/cinder-volume/config-internal.sh @@ -6,10 +6,14 @@ set -e . /opt/kolla/config-cinder.sh . /opt/kolla/volume-group-create.sh -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 +check_required_vars CINDER_ENABLED_BACKEND \ + CINDER_LVM_LO_VOLUME_SIZE \ + CINDER_VOLUME_API_LISTEN \ + CINDER_VOLUME_BACKEND_NAME \ + CINDER_VOLUME_DRIVER \ + CINDER_VOLUME_GROUP \ + ISCSI_HELPER \ + ISCSI_IP_ADDRESS cfg=/etc/cinder/cinder.conf |
