hot-fixes
This commit is contained in:
parent
95e7354749
commit
cb0950b383
|
@ -7,10 +7,10 @@ lxc.rootfs.backend = dir
|
||||||
lxc.autodev = 1
|
lxc.autodev = 1
|
||||||
lxc.kmsg = 0
|
lxc.kmsg = 0
|
||||||
|
|
||||||
{%- for net, type in container.interfaces.items() %}
|
{%- for net, conf in container['interfaces'].items() %}
|
||||||
lxc.network.type={{ type }}
|
lxc.network.type={{ conf['type'] }}
|
||||||
lxc.network.flags=up
|
lxc.network.flags=up
|
||||||
{% if type == 'veth' %}
|
{% if conf['type'] == 'veth' %}
|
||||||
lxc.network.veth.pair={{ id }}-{{ net }}
|
lxc.network.veth.pair={{ id }}-{{ net }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- set inet_addr = pillar['hosts-inet'][net].get(id) %}
|
{%- set inet_addr = pillar['hosts-inet'][net].get(id) %}
|
||||||
|
@ -18,7 +18,7 @@ lxc.network.veth.pair={{ id }}-{{ net }}
|
||||||
{%- set prefix_len = pillar['subnets-inet'][net].split('/')[1] %}
|
{%- set prefix_len = pillar['subnets-inet'][net].split('/')[1] %}
|
||||||
lxc.network.ipv4={{ inet_addr }}/{{ prefix_len }}
|
lxc.network.ipv4={{ inet_addr }}/{{ prefix_len }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if type == 'veth' %}
|
{%- if conf['type'] == 'veth' %}
|
||||||
lxc.network.link=br-{{ net }}
|
lxc.network.link=br-{{ net }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
lxc.network.name={{ net }}
|
lxc.network.name={{ net }}
|
||||||
|
|
|
@ -26,6 +26,6 @@ upstream1:
|
||||||
type: veth
|
type: veth
|
||||||
|
|
||||||
anon1:
|
anon1:
|
||||||
interface:
|
interfaces:
|
||||||
core:
|
core:
|
||||||
type: veth
|
type: veth
|
||||||
|
|
Loading…
Reference in New Issue