diff --git a/group_vars/fet_containers b/group_vars/fet_lxc_debian similarity index 100% rename from group_vars/fet_containers rename to group_vars/fet_lxc_debian diff --git a/group_vars/fet_lxc_void b/group_vars/fet_lxc_void new file mode 100644 index 0000000..3f9a804 --- /dev/null +++ b/group_vars/fet_lxc_void @@ -0,0 +1,2 @@ +--- +common_apt: False diff --git a/host_vars/ariane b/host_vars/ariane index 0ad723b..243936f 100644 --- a/host_vars/ariane +++ b/host_vars/ariane @@ -1,17 +1,40 @@ +--- inventory_hostname: ariane.fet.htu.tuwien.ac.at inventory_hostname_short: ariane lxc: containers: + - name: laika + 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 + - name: betam revision: "01" template: debian config: - - lxc.network.hwaddr = 2e:6d:b6:07:14:01 + - 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.cgroup.devices.allow = c 188:0 rwm + - name: zyklon revision: "01" template: voidlinux config: - lxc.network.hwaddr = 2e:6d:b6:07:15:01 - lxc.pts = 6 + + - name: proteus + 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 diff --git a/host_vars/lxc-laika-01 b/host_vars/lxc-laika-01 new file mode 100644 index 0000000..72f2338 --- /dev/null +++ b/host_vars/lxc-laika-01 @@ -0,0 +1,2 @@ +inventory_hostname: laika.fet.htu.tuwien.ac.at +inventory_hostname_short: laika diff --git a/host_vars/lxc-proteus-01 b/host_vars/lxc-proteus-01 new file mode 100644 index 0000000..9ce50c9 --- /dev/null +++ b/host_vars/lxc-proteus-01 @@ -0,0 +1,2 @@ +inventory_hostname: proteus.fet.htu.tuwien.ac.at +inventory_hostname_short: proteus diff --git a/hosts/production b/hosts/production index 537dc55..d6ac503 100644 --- a/hosts/production +++ b/hosts/production @@ -3,10 +3,14 @@ all: fet_hosts: hosts: ariane: - fet_containers: + fet_lxc_debian: hosts: lxc-pet-01: + laika: betam: + proteus: + fet_lxc_void: + hosts: zyklon: vars: ansible_python_interpreter=/usr/bin/python3 diff --git a/roles/ariane/files/lxc_default.conf b/roles/ariane/files/lxc_default.conf index 404f85f..e933971 100644 --- a/roles/ariane/files/lxc_default.conf +++ b/roles/ariane/files/lxc_default.conf @@ -1,5 +1,5 @@ lxc.network.type = veth -lxc.network.link = br0 +lxc.network.link = lxcbr0 lxc.network.flags = up lxc.aa_profile = unconfined diff --git a/site.yml b/site.yml index 6f7b812..925a98f 100644 --- a/site.yml +++ b/site.yml @@ -13,7 +13,11 @@ roles: - common -- hosts: fet_containers +- hosts: fet_lxc_debian + roles: + - common + +- hosts: fet_lxc_void roles: - common