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>

1 files changed, 2 insertions, 16 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
index db78580..c96462d 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.conf
@@ -680,7 +680,7 @@ os_tenant_name=%SERVICE_TENANT_NAME%
 
 # Auth URL to use for openstack service access (string value)
 #os_auth_url=http://localhost:5000/v2.0
-os_auth_url=http://%CONTROLLER_IP%:5000/v2.0
+os_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0
 
 # Region name to use for openstack service endpoints (string
 # value)
@@ -713,25 +713,11 @@ os_auth_url=http://%CONTROLLER_IP%:5000/v2.0
 #
 # Options defined in keystoneclient.middleware.auth_token
 #
-
+identity_uri=http://127.0.0.1:8081/keystone/admin/
 # Prefix to prepend at the beginning of the path (string
 # value)
 #auth_admin_prefix=
 
-# Host providing the admin Identity API endpoint (string
-# value)
-auth_host=%CONTROLLER_IP%
-
-# Port of the admin Identity API endpoint (integer value)
-#auth_port=35357
-
-# Protocol of the admin Identity API endpoint(http or https)
-# (string value)
-auth_protocol=http
-
-# Complete public Identity API endpoint (string value)
-#auth_uri=<None>
-
 # API version of the admin Identity API endpoint (string
 # value)
 #auth_version=<None>