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

fix PR#39410

Browse Source 
if opts['name'] doesn't contain a .DOMAIN.TLD, this will fail to unpack 2 values
This commit is contained in:
Vasili Syrakis 2017-02-17 10:23:18 +11:00 committed by GitHub
parent 6faa03431b
commit cd1cf1fb02
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/cloud/clouds/vmware.py
View File

@ -2570,8 +2570,8 @@ def create(vm_):
global_ip = vim.vm.customization.GlobalIPSettings()
if 'dns_servers' in list(vm_.keys()):
global_ip.dnsServerList = vm_['dns_servers']
hostName, domainName = split(r'[^\w-]', vm_name, maxsplit=1)
domainName = domainName.split('.', maxsplit=1)[-1]
hostName = split(r'[^\w-]', vm_name, maxsplit=1)[0]
domainName = vm_name.split('.', maxsplit=1)[-1]
if 'Windows' not in object_ref.config.guestFullName:
identity = vim.vm.customization.LinuxPrep()
identity.hostName = vim.vm.customization.FixedName(name=hostName)