Merge branch 'master' into fetlab

This commit is contained in:
Daniel A. Maierhofer
2018-10-27 00:39:23 +02:00
21 changed files with 3180 additions and 63 deletions

View File

@@ -2,7 +2,8 @@
inventory_hostname: ariane.fet.htu.tuwien.ac.at
inventory_hostname_short: ariane
common_interfaces: interfaces_ariane.j2
common_interfaces: True
common_interfaces_file: interfaces_ariane.j2
common_iptables_v4: "iptables_ariane_v4.j2"
common_iptables_v6: "iptables_ariane_v6.j2"
@@ -12,26 +13,29 @@ lxc:
revision: "01"
template: debian
config:
- lxc.network.1.type = veth
- lxc.network.1.hwaddr = 1c:bd:b9:7f:fe:a4
- lxc.network.1.link = br0
- lxc.network.1.flags = up
- lxc.network.type = veth
- lxc.network.hwaddr = 1c:bd:b9:7f:fe:a4
- lxc.network.link = br0
- lxc.network.flags = up
- name: betam
revision: "01"
template: debian
config:
- lxc.network.1.type = veth
- lxc.network.1.hwaddr = 2e:6d:b6:07:14:01
- lxc.network.1.link = br0
- lxc.network.1.flags = up
- lxc.network.type = veth
- lxc.network.hwaddr = 2e:6d:b6:07:14:01
- lxc.network.link = br0
- lxc.network.flags = up
- lxc.cgroup.devices.allow = c 188:0 rwm
- name: zyklon
revision: "01"
template: voidlinux
config:
- lxc.network.type = veth
- lxc.network.hwaddr = 2e:6d:b6:07:15:01
- lxc.network.link = br0
- lxc.network.flags = up
- lxc.pts = 6
- name: progress
@@ -60,9 +64,10 @@ lxc:
revision: "01"
template: debian
config:
- lxc.network.1.type = veth
- lxc.network.1.hwaddr = 2e:6d:b6:07:16:01
- lxc.network.1.link = br0
- lxc.network.1.flags = up
- lxc.network.type = veth
- lxc.network.hwaddr = 2e:6d:b6:07:16:01
- lxc.network.link = br0
- lxc.network.flags = up
common_zfs: True
common_snapper: False

View File

@@ -3,4 +3,4 @@ inventory_hostname_short: progress
common_iptables_v4: "iptables_progress_v4.j2"
common_iptables_v6: "iptables_progress_v6.j2"
printer_ip: 192.168.86.14
printer_ip: dell3465