openstack/openstack-ansible
Code Issues Proposed changes

Merge "container_host can be replaced by physical_host on is_metal"

Browse Source
This commit is contained in:
Zuul
2018-01-26 17:56:21 +00:00
committed by Gerrit Code Review
parent 7cd9fec86f 8a3dfc01fa
commit 7a3a30ad0b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osa_toolkit/generate.py
View File

@@ -644,7 +644,10 @@ def _add_additional_networks(key, inventory, ip_q, q_name, netmask, interface,
cphg = container.get('physical_host_group') cphg = container.get('physical_host_group')
# user_config data from the container physical host group # user_config data from the container physical host group
phg = user_config[cphg][container_host] if user_config[cphg].get(container_host) is not None:
phg = user_config[cphg][container_host]
else:
phg = user_config[cphg][physical_host]
network['address'] = phg['ip'] network['address'] = phg['ip']
if is_ssh_address is True: if is_ssh_address is True: