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

Merge pull request #41641 from rallytime/merge-nitrogen

Browse Source 
[nitrogen] Merge forward from 2016.11 to nitrogen
This commit is contained in:
Nicole Thomas 2017-06-07 13:52:14 -06:00 committed by GitHub
commit 83cb447a96
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config/__init__.py
View File

@ -3151,7 +3151,7 @@ def is_profile_configured(opts, provider, profile_name, vm_=None):
alias, driver = provider.split(':') alias, driver = provider.split(':')
# Most drivers need an image to be specified, but some do not. # Most drivers need an image to be specified, but some do not.
non_image_drivers = ['nova', 'virtualbox', 'libvirt'] non_image_drivers = ['nova', 'virtualbox', 'libvirt', 'softlayer']
# Most drivers need a size, but some do not. # Most drivers need a size, but some do not.
non_size_drivers = ['opennebula', 'parallels', 'proxmox', 'scaleway', non_size_drivers = ['opennebula', 'parallels', 'proxmox', 'scaleway',

20
salt/modules/linux_sysctl.py
View File

@ -35,21 +35,6 @@ def __virtual__():
return __virtualname__ return __virtualname__
def _check_systemd_salt_config():
conf = '/etc/sysctl.d/99-salt.conf'
if not os.path.exists(conf):
sysctl_dir = os.path.split(conf)[0]
if not os.path.exists(sysctl_dir):
os.makedirs(sysctl_dir)
try:
with salt.utils.fopen(conf, 'w'):
pass
except (IOError, OSError):
msg = 'Could not create file: {0}'
raise CommandExecutionError(msg.format(conf))
return conf
def default_config(): def default_config():
''' '''
Linux hosts using systemd 207 or later ignore ``/etc/sysctl.conf`` and only Linux hosts using systemd 207 or later ignore ``/etc/sysctl.conf`` and only
@ -65,7 +50,7 @@ def default_config():
''' '''
if salt.utils.systemd.booted(__context__) \ if salt.utils.systemd.booted(__context__) \
and salt.utils.systemd.version(__context__) >= 207: and salt.utils.systemd.version(__context__) >= 207:
return _check_systemd_salt_config() return '/etc/sysctl.d/99-salt.conf'
return '/etc/sysctl.conf' return '/etc/sysctl.conf'
@ -180,6 +165,9 @@ def persist(name, value, config=None):
edited = False edited = False
# If the sysctl.conf is not present, add it # If the sysctl.conf is not present, add it
if not os.path.isfile(config): if not os.path.isfile(config):
sysctl_dir = os.path.dirname(config)
if not os.path.exists(sysctl_dir):
os.makedirs(sysctl_dir)
try: try:
with salt.utils.fopen(config, 'w+') as _fh: with salt.utils.fopen(config, 'w+') as _fh:
_fh.write('#\n# Kernel sysctl configuration\n#\n') _fh.write('#\n# Kernel sysctl configuration\n#\n')

1
salt/states/cmd.py
View File

@ -335,6 +335,7 @@ def mod_run_check(cmd_kwargs, onlyif, unless, creates):
# to quote problems # to quote problems
cmd_kwargs = copy.deepcopy(cmd_kwargs) cmd_kwargs = copy.deepcopy(cmd_kwargs)
cmd_kwargs['use_vt'] = False cmd_kwargs['use_vt'] = False
cmd_kwargs['bg'] = False
if onlyif is not None: if onlyif is not None:
if isinstance(onlyif, string_types): if isinstance(onlyif, string_types):