From 59a83fa1d29006720d871285c857920fe4f9e68b Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 7 May 2014 14:34:19 -0400 Subject: cinder: add keyston auth section To avoid SSL default communications, and quota/volume errors, we expicitly add a keystone configuration section to the cinder configuration. Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/python/python-cinder/cinder.conf | 8 ++++++++ meta-openstack/recipes-devtools/python/python-cinder_git.bb | 3 +++ 2 files changed, 11 insertions(+) (limited to 'meta-openstack/recipes-devtools/python') diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf index 24bbc23..80adfe4 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf +++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf @@ -1240,3 +1240,11 @@ volume_backend_name=RBD_CEPH # [nova_client] # max_timing_buffer=100 + +[keystone_authtoken] +auth_host = 127.0.0.1 +auth_port = 35357 +auth_protocol = http +admin_tenant_name = %SERVICE_TENANT_NAME% +admin_user = %SERVICE_USER% +admin_password = %SERVICE_PASSWORD% diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index 0239406..f14102e 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -40,6 +40,9 @@ do_install_append() { sed -e "s:%DB_USER%:${DB_USER}:g" -i ${WORKDIR}/cinder.conf sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${WORKDIR}/cinder.conf sed -e "s:%CINDER_BACKUP_BACKEND_DRIVER%:${CINDER_BACKUP_BACKEND_DRIVER}:g" -i ${WORKDIR}/cinder.conf + sed -e "s:%SERVICE_TENANT_NAME%:${SERVICE_TENANT_NAME}:g" -i ${WORKDIR}/cinder.conf + sed -e "s:%SERVICE_USER%:${SRCNAME}:g" -i ${WORKDIR}/cinder.conf + sed -e "s:%SERVICE_PASSWORD%:${SERVICE_PASSWORD}:g" -i ${WORKDIR}/cinder.conf install -d ${CINDER_CONF_DIR} install -m 600 ${WORKDIR}/cinder.conf ${CINDER_CONF_DIR}/ -- cgit v1.2.3-54-g00ecf