openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Refactor creation of no_proxy list for postconfig"

Browse Source
This commit is contained in:
Jenkins
2016-11-23 15:21:19 +00:00
committed by Gerrit Code Review
parent 0f9ebe7722 0b2cf71a84
commit 9f6721558a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/v1/overcloud_deploy.py
View File

@@ -664,9 +664,13 @@ class DeployOvercloud(command.Command):
overcloud_ip_or_fqdn = six.moves.urllib.parse.urlparse( overcloud_ip_or_fqdn = six.moves.urllib.parse.urlparse(
overcloud_endpoint).hostname overcloud_endpoint).hostname
no_proxy = [os.environ.get('no_proxy'), overcloud_ip_or_fqdn] keystone_admin_ip = utils.get_endpoint('KeystoneAdmin', stack)
no_proxy = os.environ.get('no_proxy', overcloud_ip_or_fqdn)
no_proxy_list = map(utils.bracket_ipv6,
[no_proxy, overcloud_ip_or_fqdn,
keystone_admin_ip])
os.environ['no_proxy'] = ','.join( os.environ['no_proxy'] = ','.join(
[x for x in no_proxy if x is not None]) [x for x in no_proxy_list if x is not None])
utils.remove_known_hosts(overcloud_ip_or_fqdn) utils.remove_known_hosts(overcloud_ip_or_fqdn)