openstack
/
instack-undercloud
Code Issues Proposed changes

Provide correct non-SSL port config in ui config 

Previously, non-SSL Undercloud deployments configured the UI to use the
default service endpoint configuration ports.  Since UI no longer
connects to the service port directly in favor of Apache proxy
configurations, the port is configured to use the default non-SSL UI
port of 3000.

Change-Id: I647d1bd619071a9b4e00dba250cc263cef05fe51
Closes-Bug: #1663199
This commit is contained in:
Dan Trainor 2017-03-09 09:35:50 -05:00
parent 5c0e5108b6
commit f75a19b6ab
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
instack_undercloud/undercloud.py
View File

@ -749,8 +749,8 @@ def _generate_endpoints(instack_env):
{'host': internal_host, 'port': 8004}),
('heat-ui-config',
'%s://%s:%d/heat/v1/%%(tenant_id)s',
{'host': public_host, 'port': 8004, 'ssl_port': 443},
{'host': internal_host, 'port': 8004}),
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000}),
('neutron',
'%s://%s:%d',
{'host': public_host, 'port': 9696, 'ssl_port': 13696},
@ -778,8 +778,8 @@ def _generate_endpoints(instack_env):
{'host': internal_host, 'port': 35357}),
('keystone-ui-config',
'%s://%s:%d/keystone/v2.0',
{'host': public_host, 'port': 5000, 'ssl_port': 443},
{'host': internal_host, 'port': 5000},
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000},
{'host': internal_host, 'port': 35357}),
('swift',
'%s://%s:%d/v1/AUTH_%%(tenant_id)s',
@ -791,16 +791,16 @@ def _generate_endpoints(instack_env):
{'host': internal_host, 'port': 8080}),
('swift-ui-config',
'%s://%s:%d/swift/v1/AUTH_%%(tenant_id)s',
{'host': public_host, 'port': 8080, 'ssl_port': 443},
{'host': internal_host, 'port': 8080}),
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000}),
('ironic',
'%s://%s:%d',
{'host': public_host, 'port': 6385, 'ssl_port': 13385},
{'host': internal_host, 'port': 6385}),
('ironic-ui-config',
'%s://%s:%d/ironic',
{'host': public_host, 'port': 6385, 'ssl_port': 443},
{'host': internal_host, 'port': 6385}),
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000}),
('ironic_inspector',
'%s://%s:%d',
{'host': public_host, 'port': 5050, 'ssl_port': 13050},
@ -827,8 +827,8 @@ def _generate_endpoints(instack_env):
{'host': internal_host, 'port': 8989}),
('mistral-ui-config',
'%s://%s:%d/mistral/v2',
{'host': public_host, 'port': 8989, 'ssl_port': 443},
{'host': internal_host, 'port': 8989}),
{'host': public_host, 'port': 3000, 'ssl_port': 443},
{'host': internal_host, 'port': 3000}),
('zaqar',
'%s://%s:%d',
{'host': public_host, 'port': 8888, 'ssl_port': 13888},
@ -876,9 +876,9 @@ def _generate_endpoints(instack_env):
endpoints.update(_get_service_endpoints(
'zaqar-ui-config',
'%s://%s:%d/zaqar',
{'host': public_host, 'port': 9000, 'ssl_port': 443,
{'host': public_host, 'port': 3000, 'ssl_port': 443,
'zaqar_ws_public_proto': 'wss'},
{'host': internal_host, 'port': 9000},
{'host': internal_host, 'port': 3000},
public_proto=zaqar_ws_public_proto,
internal_proto=zaqar_ws_internal_proto))

12
releasenotes/notes/change-default-nonssl-undercloud-ports-34e60f87f3eb7ad6.yaml Normal file
View File

@ -0,0 +1,12 @@
---
upgrade:
- |
Changed the configuration of endpoints that UI uses in order to connect to
the Undercloud in a non-SSL deployment. The port number that the UI now
uses to communicate with the Undercloud for non-SSL connections is 3000,
which supports endpoint proxy configuration. Previously, this port number
was the default port number for the service endpoint that UI connected to.
fixes:
- |
Fixes `bug 1663199 <https://bugs.launchpad.net/tripleo/+bug/1663199>`__ UI doesn't work without manual update on HTTP undercloud