saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rackconnectv3 default to False, not 'False'

Browse source 
get private_ips in rackconnectv2 environment and populate data object
get public_ips and put in data object before returning "result" structure
This commit is contained in:
Ethan Erchinger 2015-10-21 20:12:54 +00:00
parent 53dd01fc24
commit b7f8487615
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/cloud/clouds/nova.py
View file

@ -645,7 +645,7 @@ def create(vm_):
return
rackconnectv3 = config.get_cloud_config_value(
'rackconnectv3', vm_, __opts__, default='False',
'rackconnectv3', vm_, __opts__, default=False,
search_global=False
)
@ -721,21 +721,29 @@ def create(vm_):
data.public_ips = access_ip
return data
# populate return data with private_ips
# when ssh_interface is set to private_ips and public_ips exist
if not result and ssh_interface(vm_) == 'private_ips':
for private_ip in private:
ignore_ip = ignore_cidr(vm_, private_ip)
if private_ip not in data.private_ips and not ignore_ip:
result.append(private_ip)
if cloudnetwork(vm_) is True:
data.public_ips = access_ip
return data
if public:
data.public_ips = public
if ssh_interface(vm_) != 'private_ips':
return data
if result:
log.debug('result = {0}'.format(result))
data.private_ips = result
if ssh_interface(vm_) == 'private_ips':
return data
if public:
data.public_ips = public
if ssh_interface(vm_) != 'private_ips':
return data
try:
data = salt.utils.cloud.wait_for_ip(
__query_node_data,