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

fixed ability to pass ssh key to Linux VMs

Browse source
This commit is contained in:
nicholasmhughes 2019-05-24 17:40:07 -04:00 • committed by Ch3LL
parent 4a141a103d
commit a1a61ee8b0
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
salt/cloud/clouds/azurearm.py
View file

@ -852,7 +852,7 @@ def create_network_interface(call=None, kwargs=None):
]
break
except CloudError as exc:
log.error('There was a cloud error: %s', exc)
log.error('There was a cloud error: {0}'.format(exc))
count += 1
if count > 120:
raise ValueError('Timed out waiting for public IP Address.')
@ -1035,15 +1035,6 @@ def request_instance(vm_):
default=False
)
vm_password = salt.utils.stringutils.to_str(
config.get_cloud_config_value(
'ssh_password', vm_, __opts__, search_global=True,
default=config.get_cloud_config_value(
'win_password', vm_, __opts__, search_global=True
)
)
)
os_kwargs = {}
win_installer = config.get_cloud_config_value(
'win_installer', vm_, __opts__, search_global=True
@ -1061,6 +1052,16 @@ def request_instance(vm_):
ssh=sshconfiguration,
)
os_kwargs['linux_configuration'] = linuxconfiguration
vm_password = None
else:
vm_password = salt.utils.stringutils.to_str(
config.get_cloud_config_value(
'ssh_password', vm_, __opts__, search_global=True,
default=config.get_cloud_config_value(
'win_password', vm_, __opts__, search_global=True
)
)
)
if win_installer or (vm_password is not None and not disable_password_authentication):
if not isinstance(vm_password, str):
@ -1327,7 +1328,7 @@ def request_instance(vm_):
),
network_profile=NetworkProfile(
network_interfaces=[
NetworkInterfaceReference(vm_['iface_id']),
NetworkInterfaceReference(id=vm_['iface_id']),
],
),
availability_set=availability_set,