openstack
/
horizon
Code Issues Proposed changes

Changed default identity url to horizon 

The keystone doesn't use 5000 port anymore from Newton version. And all
 the references should be changed together.

Change-Id: I3f02686ab5b3abf48f129fde92e90427ca148317
This commit is contained in:
白子玉 2019-12-05 11:04:48 +08:00
parent 06d4f2d088
commit 3f7fc68085
17 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/admin/customize-configure.rst
View File

@ -224,12 +224,12 @@ The standard installation uses a non-encrypted HTTP channel.
# For multiple regions uncomment this configuration, and add (endpoint, title).
# AVAILABLE_REGIONS = [
# ('http://cluster1.example.com:5000/v3', 'cluster1'),
# ('http://cluster2.example.com:5000/v3', 'cluster2'),
# ('http://cluster1.example.com/identity/v3', 'cluster1'),
# ('http://cluster2.example.com/identity/v3', 'cluster2'),
# ]
OPENSTACK_HOST = "127.0.0.1"
OPENSTACK_KEYSTONE_URL = "http://%s:5000/v3" % OPENSTACK_HOST
OPENSTACK_KEYSTONE_URL = "http://%s/identity/v3" % OPENSTACK_HOST
OPENSTACK_KEYSTONE_DEFAULT_ROLE = "Member"
# The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the

8
doc/source/configuration/settings.rst
View File

@ -1232,7 +1232,7 @@ AVAILABLE_REGIONS
Default: ``None``
A list of tuples which define multiple regions. The tuple format is
``('http://{{ keystone_host }}:5000/v3', '{{ region_name }}')``. If any regions
``('http://{{ keystone_host }}/identity/v3', '{{ region_name }}')``. If any regions
are specified the login form will have a dropdown selector for authenticating
to the appropriate region, and there will be a region switcher dropdown in
the site header when logged in.
@ -1438,11 +1438,15 @@ OPENSTACK_KEYSTONE_URL
.. versionadded:: 2011.3(Diablo)
.. versionchanged:: 17.1.0(Ussuri)
The default value was changed to ``"http://%s/identity/v3" % OPENSTACK_HOST``
.. seealso::
Horizon's `OPENSTACK_HOST`_ documentation
Default: ``"http://%s:5000/v3" % OPENSTACK_HOST``
Default: ``"http://%s/identity/v3" % OPENSTACK_HOST``
The full URL for the Keystone endpoint used for authentication. Unless you
are using HTTPS, running your Keystone server on a nonstandard port, or using

2
doc/source/contributor/quickstart.rst
View File

@ -59,7 +59,7 @@ from within the ``horizon`` directory.
$ cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
Horizon connects to the rest of OpenStack via a Keystone service catalog. By
default Horizon looks for an endpoint at ``http://localhost:5000/v3``; this
default Horizon looks for an endpoint at ``http://localhost/identity/v3``; this
can be customised by modifying the ``OPENSTACK_HOST`` and
``OPENSTACK_KEYSTONE_URL`` values in
``openstack_dashboard/local/local_settings.py``

2
doc/source/install/install-debian.rst
View File

@ -115,7 +115,7 @@ Install and configure components
.. path /etc/openstack-dashboard/local_settings.py
.. code-block:: python
OPENSTACK_KEYSTONE_URL = "http://%s:5000/v3" % OPENSTACK_HOST
OPENSTACK_KEYSTONE_URL = "http://%s/identity/v3" % OPENSTACK_HOST
.. end

2
doc/source/install/install-obs.rst
View File

@ -101,7 +101,7 @@ Install and configure components
.. path /srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py
.. code-block:: python
OPENSTACK_KEYSTONE_URL = "http://%s:5000/v3" % OPENSTACK_HOST
OPENSTACK_KEYSTONE_URL = "http://%s/identity/v3" % OPENSTACK_HOST
.. end

2
doc/source/install/install-rdo.rst
View File

@ -92,7 +92,7 @@ Install and configure components
.. path /etc/openstack-dashboard/local_settings
.. code-block:: python
OPENSTACK_KEYSTONE_URL = "http://%s:5000/v3" % OPENSTACK_HOST
OPENSTACK_KEYSTONE_URL = "http://%s/identity/v3" % OPENSTACK_HOST
.. end

2
doc/source/install/install-ubuntu.rst
View File

@ -89,7 +89,7 @@ Install and configure components
.. path /etc/openstack-dashboard/local_settings.py
.. code-block:: python
OPENSTACK_KEYSTONE_URL = "http://%s:5000/v3" % OPENSTACK_HOST
OPENSTACK_KEYSTONE_URL = "http://%s/identity/v3" % OPENSTACK_HOST
.. end

3
openstack_auth/defaults.py
View File

@ -23,8 +23,7 @@ WEBROOT = '/'
# TODO(amotoki): What is the right default value in openstack_auth?
LOGIN_ERROR = 'error/'
OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v3"
# OPENSTACK_KEYSTONE_URL = 'http://localhost/identity/v3'
OPENSTACK_KEYSTONE_URL = "http://localhost/identity/v3"
# TODO(amotoki): The default value in openstack_dashboard is different:
# publicURL. It should be consistent.

8
openstack_auth/tests/data_v3.py
View File

@ -63,19 +63,19 @@ def generate_test_data(service_providers=False, endpoint='localhost'):
'id': uuid.uuid4().hex,
'endpoints': [
{
'url': 'http://admin.%s:5000/v3' % endpoint,
'url': 'http://admin.%s/identity/v3' % endpoint,
'region': 'RegionOne',
'interface': 'admin',
'id': uuid.uuid4().hex,
},
{
'url': 'http://internal.%s:5000/v3' % endpoint,
'url': 'http://internal.%s/identity/v3' % endpoint,
'region': 'RegionOne',
'interface': 'internal',
'id': uuid.uuid4().hex
},
{
'url': 'http://public.%s:5000/v3' % endpoint,
'url': 'http://public.%s/identity/v3' % endpoint,
'region': 'RegionOne',
'interface': 'public',
'id': uuid.uuid4().hex
@ -214,7 +214,7 @@ def generate_test_data(service_providers=False, endpoint='localhost'):
sp_list = None
if service_providers:
test_data.sp_auth_url = 'http://service_provider_endp:5000/v3'
test_data.sp_auth_url = 'http://service_provider_endp/identity/v3'
test_data.service_provider_id = 'k2kserviceprovider'
# The access info for the identity provider
# should return a list of service providers

11
openstack_auth/tests/unit/test_auth.py
View File

@ -244,7 +244,7 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin,
self.data = data_v3.generate_test_data()
self.ks_client_module = client_v3
settings.OPENSTACK_API_VERSIONS['identity'] = 3
settings.OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v3"
settings.OPENSTACK_KEYSTONE_URL = "http://localhost/identity/v3"
self.mox.StubOutClassWithMocks(token_endpoint, 'Token')
self.mox.StubOutClassWithMocks(v3_auth, 'Token')
@ -594,7 +594,7 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin,
service_provider=target_provider)
plugin.get_access(mox.IsA(session.Session)). \
AndReturn(self.sp_data.unscoped_access_info)
plugin.auth_url = 'http://service_provider_endp:5000/v3'
plugin.auth_url = 'http://service_provider_endp/identity/v3'
# mock authenticate for service provider
sp_projects = [self.sp_data.project_one, self.sp_data.project_two]
@ -833,7 +833,7 @@ class OpenStackAuthTestsWebSSO(OpenStackAuthTestsMixin,
self.idp_saml2_id = uuid.uuid4().hex
settings.OPENSTACK_API_VERSIONS['identity'] = 3
settings.OPENSTACK_KEYSTONE_URL = 'http://localhost:5000/v3'
settings.OPENSTACK_KEYSTONE_URL = 'http://localhost/identity/v3'
settings.WEBSSO_ENABLED = True
settings.WEBSSO_CHOICES = (
('credentials', 'Keystone Credentials'),
@ -895,7 +895,7 @@ class OpenStackAuthTestsWebSSO(OpenStackAuthTestsMixin,
self.assertRedirects(response, redirect_url, status_code=302,
target_status_code=404)
@override_settings(WEBSSO_KEYSTONE_URL='http://keystone-public:5000/v3')
@override_settings(WEBSSO_KEYSTONE_URL='http://keystone-public/identity/v3')
def test_websso_redirect_using_websso_keystone_url(self):
origin = 'http://testserver/auth/websso/'
protocol = 'oidc'
@ -935,7 +935,8 @@ class OpenStackAuthTestsWebSSO(OpenStackAuthTestsMixin,
self.assertRedirects(response, settings.LOGIN_REDIRECT_URL)
def test_websso_login_with_auth_in_url(self):
settings.OPENSTACK_KEYSTONE_URL = 'http://auth.openstack.org:5000/v3'
settings.OPENSTACK_KEYSTONE_URL =\
'http://auth.openstack.org/identity/v3'
projects = [self.data.project_one, self.data.project_two]
domains = []

4
openstack_dashboard/defaults.py
View File

@ -131,8 +131,8 @@ API_RESULT_PAGE_SIZE = 20
# For multiple regions uncomment this configuration, and add (endpoint, title).
# AVAILABLE_REGIONS = [
# ('http://cluster1.example.com:5000/v3', 'cluster1'),
# ('http://cluster2.example.com:5000/v3', 'cluster2'),
# ('http://cluster1.example.com/identity/v3', 'cluster1'),
# ('http://cluster2.example.com/identity/v3', 'cluster2'),
# ]
AVAILABLE_REGIONS = []

2
openstack_dashboard/local/local_settings.py.example
View File

@ -118,7 +118,7 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
#EMAIL_HOST_PASSWORD = 'top-secret!'
OPENSTACK_HOST = "127.0.0.1"
OPENSTACK_KEYSTONE_URL = "http://%s:5000/v3" % OPENSTACK_HOST
OPENSTACK_KEYSTONE_URL = "http://%s/identity/v3" % OPENSTACK_HOST
# The timezone of the server. This should correspond with the timezone
# of your entire OpenStack installation, and hopefully be in UTC.

6
openstack_dashboard/test/settings.py
View File

@ -120,11 +120,11 @@ settings_utils.find_static_files(HORIZON_CONFIG, AVAILABLE_THEMES,
IMAGES_ALLOW_LOCATION = True
AVAILABLE_REGIONS = [
('http://localhost:5000/v3', 'local'),
('http://remote:5000/v3', 'remote'),
('http://localhost/identity/v3', 'local'),
('http://remote/identity/v3', 'remote'),
]
OPENSTACK_KEYSTONE_URL = "http://localhost:5000/v3"
OPENSTACK_KEYSTONE_URL = "http://localhost/identity/v3"
OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = True
OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'test_domain'

6
openstack_dashboard/test/test_data/keystone_data.py
View File

@ -89,9 +89,9 @@ SERVICE_CATALOG = [
"endpoints_links": [],
"endpoints": [
{"region": "RegionOne",
"adminURL": "http://admin.keystone.example.com:5000/v3",
"internalURL": "http://int.keystone.example.com:5000/v3",
"publicURL": "http://public.keystone.example.com:5000/v3"}]},
"adminURL": "http://admin.keystone.example.com/identity/v3",
"internalURL": "http://int.keystone.example.com/identity/v3",
"publicURL": "http://public.keystone.example.com/identity/v3"}]},
{"type": "object-store",
"name": "swift",
"endpoints_links": [],

2
openstack_dashboard/test/unit/api/test_base.py
View File

@ -315,7 +315,7 @@ class ApiHelperTests(test.APITestCase):
self.request.user.services_region = "bogus_value"
url = api_base.url_for(self.request, 'identity',
endpoint_type='adminURL')
self.assertEqual('http://admin.keystone.example.com:5000/v3', url)
self.assertEqual('http://admin.keystone.example.com/identity/v3', url)
self.request.user.services_region = "bogus_value"
with self.assertRaises(exceptions.ServiceCatalogException):

4
openstack_dashboard/test/unit/api/test_keystone.py
View File

@ -81,9 +81,9 @@ class ServiceAPITests(test.APIMockTestCase):
self.assertEqual(u"identity (native backend)", six.text_type(service))
self.assertEqual(identity_data["endpoints"][0]["region"],
service.region)
self.assertEqual("http://int.keystone.example.com:5000/v3",
self.assertEqual("http://int.keystone.example.com/identity/v3",
service.url)
self.assertEqual("http://public.keystone.example.com:5000/v3",
self.assertEqual("http://public.keystone.example.com/identity/v3",
service.public_url)
self.assertEqual("int.keystone.example.com", service.host)

6
releasenotes/notes/change-keystone-url-default-value-6a56397acf4f7328.yaml Normal file
View File

@ -0,0 +1,6 @@
---
other:
- |
The default `OPENSTACK_KEYSTONE_URL` value has been changed to
``"http://%s/identity/v3" % OPENSTACK_HOST`` from
``"http://%s:5000/v3" % OPENSTACK_HOST``.