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 <Liam.Howlett@WindRiver.com>

2 files changed, 2 insertions, 5 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf b/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf
index 25119ff..2557abb 100644
--- a/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf
+++ b/meta-openstack/recipes-devtools/python/python-swift/dispersion.conf
@@ -1,5 +1,5 @@
 [dispersion]
-auth_url = http://localhost:5000/v2.0/
+auth_url = http://localhost:8081/keystone/main
 auth_user = %SERVICE_TENANT_NAME%:%SERVICE_USER%
 auth_key = %SERVICE_PASSWORD%
 auth_version = 2.0
diff --git a/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf b/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf
index d005d8e..eef6ac5 100644
--- a/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf
+++ b/meta-openstack/recipes-devtools/python/python-swift/proxy-server.conf
@@ -247,10 +247,7 @@ user_test_tester3 = testing3
 #
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-# auth_uri = http://127.0.0.1:5000/
+identity_uri=http://127.0.0.1:8081/keystone/main
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USER%
 admin_password = %SERVICE_PASSWORD%