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

Remove Oxygen deprecation warning in lxc execution module

Browse Source
This commit is contained in:
rallytime 2017-07-13 16:42:42 -06:00
parent 38a67d7648
commit ccd78ed791
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/topics/releases/oxygen.rst
View File

@ -67,6 +67,13 @@ Module Deprecations
The ``blockdev`` execution module has been removed. Its functions were merged
with the ``disk`` module. Please use the ``disk`` execution module instead.
The ``lxc`` execution module had the following changes:
- The ``dnsservers`` option to the ``cloud_init_interface`` function no longer
defaults to ``4.4.4.4`` and ``8.8.8.8``.
- The ``dns_via_dhcp`` option to the ``cloud_init_interface`` function defaults
to ``True`` now instead of ``False``.
The ``win_psget`` module had the following changes:
- The ``psversion`` function was removed. Please use ``cmd.shell_info`` instead.

10
salt/modules/lxc.py
View File

@ -288,10 +288,8 @@ def cloud_init_interface(name, vm_=None, **kwargs):
any extra argument for the salt minion config
dnsservers
list of DNS servers to set inside the container
(Defaults to 8.8.8.8 and 4.4.4.4 until Oxygen release)
dns_via_dhcp
do not set the dns servers, let them be set by the dhcp.
(Defaults to False until Oxygen release)
autostart
autostart the container at boot time
password
@ -404,13 +402,7 @@ def cloud_init_interface(name, vm_=None, **kwargs):
snapshot = _cloud_get('snapshot', False)
autostart = bool(_cloud_get('autostart', True))
dnsservers = _cloud_get('dnsservers', [])
dns_via_dhcp = _cloud_get('dns_via_dhcp', False)
if not dnsservers and not dns_via_dhcp:
salt.utils.warn_until('Oxygen', (
'dnsservers will stop defaulting to 8.8.8.8 and 4.4.4.4 '
'in Oxygen. Please set your dnsservers.'
))
dnsservers = ['8.8.8.8', '4.4.4.4']
dns_via_dhcp = _cloud_get('dns_via_dhcp', True)
password = _cloud_get('password', 's3cr3t')
password_encrypted = _cloud_get('password_encrypted', False)
fstype = _cloud_get('fstype', None)