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

LXC gateway provisioned only when IP is provided

Browse source 
The directive `lxc.network.ipv4.gateway = auto` should not be added to an LXC configuration file when no IP address is specified. It results in the following error: 

```
lxc-start 1441227080.264 ERROR    lxc_conf - conf.c:setup_netdev:2724 - Cannot add ipv4 gateway for eth0 when not assigning an address
```
This commit is contained in:
Marc Vieira-Cardinal 2015-09-02 21:51:56 -04:00
parent a563af29d3
commit 36d5a62262
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