diff options
author | Liam R. Howlett <Liam.Howlett@WindRiver.com> | 2014-09-19 15:52:17 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-22 11:46:43 -0400 |
commit | 1c34736247f8ae18d054cfecfec54152bf27f1d9 (patch) | |
tree | f5c2a952d804fc43c00e1be89751551b579aa6c0 /meta-openstack/recipes-devtools/python/python-heat | |
parent | bf51fa4f053a6aecb816ed7b4dcca64e9bd5b9b3 (diff) | |
download | meta-cloud-services-1c34736247f8ae18d054cfecfec54152bf27f1d9.tar.gz |
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>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-heat')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-heat/heat.conf | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-heat/heat.conf b/meta-openstack/recipes-devtools/python/python-heat/heat.conf index 95c88a1..4d84412 100644 --- a/meta-openstack/recipes-devtools/python/python-heat/heat.conf +++ b/meta-openstack/recipes-devtools/python/python-heat/heat.conf | |||
@@ -725,10 +725,7 @@ heat_waitcondition_server_url=http://%CONTROLLER_IP%:8000/v1/waitcondition | |||
725 | #password=<None> | 725 | #password=<None> |
726 | 726 | ||
727 | [keystone_authtoken] | 727 | [keystone_authtoken] |
728 | auth_host = %CONTROLLER_IP% | 728 | identity_uri=http://%CONTROLLER_IP%:8081/keystone/main |
729 | auth_port = 35357 | ||
730 | auth_protocol = http | ||
731 | auth_uri = http://%CONTROLLER_IP%:5000/v2.0 | ||
732 | 729 | ||
733 | admin_tenant_name = %SERVICE_TENANT_NAME% | 730 | admin_tenant_name = %SERVICE_TENANT_NAME% |
734 | admin_user = heat | 731 | admin_user = heat |