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

Merge pull request #39410 from cetanu/develop

Browse Source 
allow non-hostname characters in vmware obj name
This commit is contained in:
Mike Place 2017-02-15 10:35:02 -07:00 committed by GitHub
commit 9e88357f3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ configuration, run :py:func:`test_vcenter_connection`
# Import python libs
from __future__ import absolute_import
from random import randint
from re import findall
from re import findall, split
import pprint
import logging
import time
@ -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 = vm_name.split('.')[0]
domainName = vm_name.split('.', 1)[-1]
hostName, domainName = split(r'[^\w-]', vm_name, maxsplit=1)
domainName = domainName.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)