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-nova/nova.conf | 6 ++---- meta-openstack/recipes-devtools/python/python-nova/openrc | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'meta-openstack/recipes-devtools/python/python-nova') diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf index 09ae44c..3cb143d 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf +++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf @@ -50,7 +50,7 @@ neutron_auth_strategy=keystone neutron_admin_tenant_name=service neutron_admin_username=neutron neutron_admin_password=password -neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ +neutron_admin_auth_url=http://%CONTROLLER_IP%:8081/keystone/main/v2.0 # Disables reporting of network state to the controller vif_plugging_timeout=10 @@ -85,9 +85,7 @@ server_proxyclient_address=%COMPUTE_IP% auth_strategy=keystone [keystone_authtoken] -auth_host = %CONTROLLER_IP% -auth_port = 35357 -auth_protocol = http +identity_uri=http://127.0.0.1:8081/keystone/admin admin_tenant_name = %SERVICE_TENANT_NAME% admin_user = %SERVICE_USER% admin_password = %SERVICE_PASSWORD% diff --git a/meta-openstack/recipes-devtools/python/python-nova/openrc b/meta-openstack/recipes-devtools/python/python-nova/openrc index 35327ac..e8507f2 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/openrc +++ b/meta-openstack/recipes-devtools/python/python-nova/openrc @@ -1,8 +1,8 @@ export OS_TENANT_NAME=admin export OS_USERNAME=admin export OS_PASSWORD=%OS_PASSWORD% -export OS_AUTH_URL="http://%CONTROLLER_HOST%:5000/v2.0/" -export SERVICE_ENDPOINT="http://%CONTROLLER_HOST%:35357/v2.0" +export OS_AUTH_URL="http://%CONTROLLER_HOST%:8081/keystone/main/v2.0/" +export SERVICE_ENDPOINT="http://%CONTROLLER_HOST%:8081/keystone/admin/v2.0" export SERVICE_TOKEN=%SERVICE_TOKEN% function get_field() { -- cgit v1.2.3-54-g00ecf