Merge branch 'master' into fetlab
This commit is contained in:
@@ -5,26 +5,33 @@ inventory_hostname_short: ariane
|
||||
common_interfaces: True
|
||||
common_interfaces_file: interfaces_ariane.j2
|
||||
common_iptables_v4: "iptables_ariane_v4.j2"
|
||||
common_iptables_v6: "iptables_ariane_v6.j2"
|
||||
|
||||
lxc:
|
||||
containers:
|
||||
- name: laika
|
||||
- name: sputnik
|
||||
revision: "01"
|
||||
template: debian
|
||||
template: voidlinux
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 1c:bd:b9:7f:fe:a4
|
||||
- lxc.network.link = br0
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:13:01
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
|
||||
- lxc.network.1.type = veth
|
||||
- lxc.network.1.hwaddr = 00:50:fc:ce:1b:c3
|
||||
- lxc.network.1.link = br0
|
||||
- lxc.network.1.flags = up
|
||||
- lxc.network.1.ipv4 = 128.131.95.206/24
|
||||
- lxc.network.1.ipv4.gateway = 128.131.95.1
|
||||
- lxc.pts = 6
|
||||
|
||||
- name: betam
|
||||
revision: "01"
|
||||
template: debian
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:14:01
|
||||
- lxc.network.link = br0
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
- lxc.cgroup.devices.allow = c 188:0 rwm
|
||||
|
||||
@@ -34,9 +41,10 @@ lxc:
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:15:01
|
||||
- lxc.network.link = br0
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
- lxc.pts = 6
|
||||
- lxc.mount.entry = /zv1/zyklon /var/lib/lxc/lxc-zyklon-01/rootfs/var/lib/gitea/ none bind,create=dir 0 0
|
||||
|
||||
- name: progress
|
||||
revision: "01"
|
||||
@@ -44,21 +52,29 @@ lxc:
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:19:01
|
||||
- lxc.network.link = br0
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
- lxc.pts = 6
|
||||
- lxc.mount.entry = /zv1/daten/Scans /var/lib/lxc/lxc-progress-01/rootfs/mnt/scans none bind,create=dir 0 0
|
||||
|
||||
- name: sojus
|
||||
- name: laika
|
||||
revision: "01"
|
||||
template: voidlinux
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:17:01
|
||||
- lxc.network.link = br0
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
|
||||
- lxc.network.1.type = veth
|
||||
- lxc.network.1.hwaddr = 00:15:c5:5d:78:0e
|
||||
- lxc.network.1.link = br0
|
||||
- lxc.network.1.flags = up
|
||||
- lxc.network.1.ipv4 = 128.131.95.204/24
|
||||
- lxc.network.1.ipv4.gateway = 128.131.95.1
|
||||
|
||||
- lxc.pts = 6
|
||||
- lxc.mount.entry = /zv1/sojus /var/lib/lxc/lxc-sojus-01/rootfs/home/backup/repos none bind,create=dir 0 0
|
||||
- lxc.mount.entry = /zv1/laika /var/lib/lxc/lxc-laika-01/rootfs/home/backup/repos none bind,create=dir 0 0
|
||||
|
||||
- name: proteus
|
||||
revision: "01"
|
||||
@@ -66,10 +82,29 @@ lxc:
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:16:01
|
||||
- lxc.network.link = br0
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
|
||||
- name: juri
|
||||
revision: "01"
|
||||
template: debian
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:20:01
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
|
||||
- name: fetsite
|
||||
revision: "01"
|
||||
template: debian
|
||||
config:
|
||||
- lxc.network.type = veth
|
||||
- lxc.network.hwaddr = 2e:6d:b6:07:10:01
|
||||
- lxc.network.link = br1
|
||||
- lxc.network.flags = up
|
||||
|
||||
common_zfs: True
|
||||
|
||||
common_snapper: False
|
||||
|
||||
borgbackup_install_from_repo: False
|
||||
|
||||
Reference in New Issue
Block a user