From f4e9f03a3054062b05614df2fff19fc2e429c8af Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Wed, 26 Nov 2014 18:01:36 +0000 Subject: FIXUPME: Move the authentication port and host to keystone configure --- openstack-glance.configure | 1 - openstack-keystone.configure | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openstack-glance.configure b/openstack-glance.configure index 5ef72651..7a84c5e3 100644 --- a/openstack-glance.configure +++ b/openstack-glance.configure @@ -30,7 +30,6 @@ s/##GLANCE_SERVICE_PASSWORD##/$GLANCE_SERVICE_PASSWORD/g s/##GLANCE_PUBLIC_URL##/$GLANCE_PUBLIC_URL/g s/##GLANCE_INTERNAL_URL##/$GLANCE_INTERNAL_URL/g s/##GLANCE_ADMIN_URL##/$GLANCE_ADMIN_URL/g -s/##OPENSTACK_AUTH_HOST##/$OPENSTACK_AUTH_HOST/g EOF sed -f "$ROOT"/etc/openstack-glance-setup.sed -i \ diff --git a/openstack-keystone.configure b/openstack-keystone.configure index 445c041e..2c59e45e 100644 --- a/openstack-keystone.configure +++ b/openstack-keystone.configure @@ -29,10 +29,14 @@ s/##KEYSTONE_TEMPORARY_ADMIN_PASSWORD##/$KEYSTONE_TEMPORARY_ADMIN_PASSWORD/g s/##KEYSTONE_PUBLIC_URL##/$KEYSTONE_PUBLIC_URL/g s/##KEYSTONE_INTERNAL_URL##/$KEYSTONE_INTERNAL_URL/g s/##KEYSTONE_ADMIN_URL##/$KEYSTONE_ADMIN_URL/g +s/##OPENSTACK_AUTH_HOST##/$OPENSTACK_AUTH_HOST/g +s/##OPENSTACK_AUTH_PORT##/$OPENSTACK_AUTH_PORT/g EOF sed -f "$ROOT"/etc/openstack-keystone-setup.sed -i \ "$ROOT"/etc/keystone/keystone.conf \ + "$ROOT"/etc/glance/glance-api.conf \ + "$ROOT"/etc/glance/glance-registry.conf \ "$ROOT"/usr/share/openstack/openstack-keystone-setup ########################################################################## -- cgit v1.2.1