From 6df6a7499d89e76d508e59d48b7df0a6ff12184f Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 16 Nov 2016 02:43:05 +0100 Subject: [PATCH] all forgotten stuff --- salt-pillar/upstream/upstream2.sls | 5 +++++ salt/lxc-containers-1/containers.yaml | 2 +- salt/upstream/shaping.sls | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 salt-pillar/upstream/upstream2.sls diff --git a/salt-pillar/upstream/upstream2.sls b/salt-pillar/upstream/upstream2.sls new file mode 100644 index 000000000..8df5efa --- /dev/null +++ b/salt-pillar/upstream/upstream2.sls @@ -0,0 +1,5 @@ +upstream: + interface: up2 + up-bandwidth: 6000 + flow-keys: nfct-src,nfct-dst + flows: 1024 diff --git a/salt/lxc-containers-1/containers.yaml b/salt/lxc-containers-1/containers.yaml index 4a5c5bc..74ad800 100644 --- a/salt/lxc-containers-1/containers.yaml +++ b/salt/lxc-containers-1/containers.yaml @@ -37,7 +37,7 @@ upstream2: interfaces: core: type: veth - up1: + up2: type: phys anon1: diff --git a/salt/upstream/shaping.sls b/salt/upstream/shaping.sls index c733e34..97fb3e7 100644 --- a/salt/upstream/shaping.sls +++ b/salt/upstream/shaping.sls @@ -1,6 +1,6 @@ {%- set upstream = pillar['upstream'] %} -iptables: +tc: pkg.installed: [] /etc/network/if-up.d/shaping: