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 #26875 from marccardinal/patch-2

Browse source 
LXC gateway provisioned only when IP is provided
This commit is contained in:
Justin Findlay 2015-09-10 13:31:32 -06:00
commit f2ad3c333c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/lxc.py
View file

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