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-neutron | |
| 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-neutron')
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch b/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch index dbe55db..77674a6 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch +++ b/meta-openstack/recipes-devtools/python/python-neutron/0001-neutron.conf-jumpstart-nova-state-reporting-configur.patch | |||
| @@ -34,7 +34,7 @@ Index: git/etc/neutron.conf | |||
| 34 | 34 | ||
| 35 | # Authorization URL for connection to nova in admin context. | 35 | # Authorization URL for connection to nova in admin context. |
| 36 | -# nova_admin_auth_url = | 36 | -# nova_admin_auth_url = |
| 37 | +# nova_admin_auth_url = http://%CONTROLLER_IP%:35357/v2.0 | 37 | +# nova_admin_auth_url = http://%CONTROLLER_IP%:8081/keystone/admin |
| 38 | 38 | ||
| 39 | # CA file for novaclient to verify server certificates | 39 | # CA file for novaclient to verify server certificates |
| 40 | # nova_ca_certificates_file = | 40 | # nova_ca_certificates_file = |
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/metadata_agent.ini b/meta-openstack/recipes-devtools/python/python-neutron/metadata_agent.ini index 98d958d..f9d5725 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron/metadata_agent.ini +++ b/meta-openstack/recipes-devtools/python/python-neutron/metadata_agent.ini | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # debug = True | 3 | # debug = True |
| 4 | 4 | ||
| 5 | # The Neutron user information for accessing the Neutron API. | 5 | # The Neutron user information for accessing the Neutron API. |
| 6 | auth_url = http://localhost:5000/v2.0 | 6 | identity_uri = http://localhost:8081/keystone/main |
| 7 | auth_region = RegionOne | 7 | auth_region = RegionOne |
| 8 | admin_tenant_name = %SERVICE_TENANT_NAME% | 8 | admin_tenant_name = %SERVICE_TENANT_NAME% |
| 9 | admin_user = %SERVICE_USER% | 9 | admin_user = %SERVICE_USER% |