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 #29767 from abednarik/network_mod_hpstname_fix

Browse Source 
Hosts file update in mod_hostname.
This commit is contained in:
Mike Place 2015-12-17 11:31:18 -07:00
commit 9b4c2194f6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/modules/network.py
View File

@ -38,7 +38,6 @@ def __virtual__():
# Disable on Windows, a specific file module exists:
if salt.utils.is_windows():
return False
return True
@ -948,19 +947,23 @@ def mod_hostname(hostname):
uname_cmd = '/usr/bin/uname' if salt.utils.is_smartos() else salt.utils.which('uname')
check_hostname_cmd = salt.utils.which('check-hostname')
if hostname_cmd.endswith('hostnamectl'):
__salt__['cmd.run']('{0} set-hostname {1}'.format(hostname_cmd, hostname))
return True
# Grab the old hostname so we know which hostname to change and then
# change the hostname using the hostname command
if not salt.utils.is_sunos():
if hostname_cmd.endswith('hostnamectl'):
out = __salt__['cmd.run']('{0} status'.format(hostname_cmd))
for line in out.splitlines():
line = line.split(':')
if 'Static hostname' in line[0]:
o_hostname = line[1].strip()
elif not salt.utils.is_sunos():
o_hostname = __salt__['cmd.run']('{0} -f'.format(hostname_cmd))
else:
# output: Hostname core OK: fully qualified as core.acheron.be
o_hostname = __salt__['cmd.run'](check_hostname_cmd).split(' ')[-1]
if not salt.utils.is_sunos():
if hostname_cmd.endswith('hostnamectl'):
__salt__['cmd.run']('{0} set-hostname {1}'.format(hostname_cmd, hostname))
elif not salt.utils.is_sunos():
__salt__['cmd.run']('{0} {1}'.format(hostname_cmd, hostname))
else:
__salt__['cmd.run']('{0} -S {1}'.format(uname_cmd, hostname.split('.')[0]))