openstack
/
python-tripleoclient
Code Issues Proposed changes

Fix ssl port removal logic in postconfig 

ssl_port removal hack is using wrong service list
when poping the data. This broke the ci ping tests.
This fixes the hack to use right data structure.

Closes-Bug: #1596758

Depends-On: Id428b112eeaa22ecef78a21032b0c1dcc0ac0592

Change-Id: Ifa64ec389c7b030c9001482817eaf306890812ff
This commit is contained in:
Pradeep Kilambi 2016-06-28 12:16:13 -04:00
parent 56e3a6db73
commit c20e88ace3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleoclient/v1/overcloud_deploy.py
View File

@ -421,11 +421,6 @@ class DeployOvercloud(command.Command):
try:
keystone_client.services.find(name=service)
except kscexc.NotFound:
if not tls_enabled:
# NOTE(bcrochet): Bad hack. Remove the ssl_port info from
# the os_cloud_config.SERVICES dictionary
data.pop('ssl_port', None)
service_data = self._set_service_data(service, data, stack)
if service_data:
services.update({service: service_data})
@ -458,6 +453,12 @@ class DeployOvercloud(command.Command):
admin_port=admin_port,
internal_port=internal_port)
if not tls_enabled:
# NOTE(bcrochet): Bad hack. Remove the ssl_port info from the
# os_cloud_config.SERVICES dictionary
for service_name, data in keystone.SERVICES.items():
data.pop('ssl_port', None)
keystone.setup_endpoints(
services,
client=keystone_client,