valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25943 from gczuczy/issue-19948

Browse Source 
Use private interface if there's no public_vlan defined
This commit is contained in:
Mike Place 2015-08-04 09:28:59 -06:00
commit 50bceac369
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/cloud/clouds/softlayer.py
View File

@ -347,7 +347,7 @@ def create(vm_):
private_wds = config.get_cloud_config_value(
'private_windows', vm_, __opts__, default=False
)
if private_ssh or private_wds:
if private_ssh or private_wds or public_vlan is None or public_vlan is False:
ip_type = 'primaryBackendIpAddress'
def wait_for_ip():