saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #26177 from rallytime/bp-26147

Browse source 
Back-port #26147 to 2015.5
This commit is contained in:
Mike Place 2015-08-10 12:22:01 -06:00
commit ca80f33bfd
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/lxc.py
View file

@ -840,7 +840,7 @@ def _network_conf(conf_tuples=None, **kwargs):
# (lxc.network.ipv4.gateway: auto)
if (
distutils.version.LooseVersion(version()) <= '1.0.7' and
True not in ['ipv4.gateway' in a for a in ret]
True not in ['lxc.network.ipv4.gateway' in a for a in ret]
):
ret.append({'lxc.network.ipv4.gateway': 'auto'})
return ret