From 1c34736247f8ae18d054cfecfec54152bf27f1d9 Mon Sep 17 00:00:00 2001 From: "Liam R. Howlett" Date: Fri, 19 Sep 2014 15:52:17 -0400 Subject: keystone: Change packages configuration to use apache keystone. This commit changes all required configurations to use keystone running on apache. The following packages configurations were modified for keystone running on apache: python-neutron, python-nova, tempest, python-swift, python-rally, python-heat, python-glance, python-cinder, python-ceilmoeter, python-horizon. Signed-off-by: Liam R. Howlett --- meta-openstack/recipes-devtools/python/python-glance_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-openstack/recipes-devtools/python/python-glance_git.bb') diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 52c0ebf..7775956 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -68,6 +68,7 @@ do_install_append() { -i ${WORKDIR}/glance-$file.conf sed -e "s!^#connection =.*!connection = postgresql://${DB_USER}:${DB_PASSWORD}@localhost/glance!g" \ -i ${WORKDIR}/glance-$file.conf + sed -i '/\[keystone_authtoken\]/aidentity_uri=http://127.0.0.1:8081/keystone/admin' ${WORKDIR}/glance-$file.conf done sed -e "s:^filesystem_store_datadir =.*:filesystem_store_datadir = ${sysconfdir}/${SRCNAME}/images/:g" \ -i ${WORKDIR}/glance-api.conf @@ -77,7 +78,7 @@ do_install_append() { -i ${WORKDIR}/glance-api.conf sed 's:^default_store =.*:default_store = ${GLANCE_DEFAULT_STORE}:g' -i ${WORKDIR}/glance-api.conf - sed 's:^swift_store_auth_address =.*:swift_store_auth_address = http\://127.0.0.1\:5000/v2.0/:g' -i ${WORKDIR}/glance-api.conf + sed 's:^swift_store_auth_address =.*:swift_store_auth_address = http\://127.0.0.1\:8081/keystone/main/:g' -i ${WORKDIR}/glance-api.conf sed 's:^swift_store_user =.*:swift_store_user = ${SERVICE_TENANT_NAME}\:${SRCNAME}:g' -i ${WORKDIR}/glance-api.conf sed 's:^swift_store_key =.*:swift_store_key = ${SERVICE_PASSWORD}:g' -i ${WORKDIR}/glance-api.conf sed 's:^swift_store_create_container_on_put =.*:swift_store_create_container_on_put = True:g' -i ${WORKDIR}/glance-api.conf -- cgit v1.2.3-54-g00ecf