From 7e9ad5b771ec8a43f8154d56f20766e6480def14 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Thu, 15 Mar 2018 00:23:38 +0100 Subject: [PATCH] Add vm zyklon --- roles/ariane/files/lxc-zyklon.conf | 15 +++++++++++++++ roles/ariane/tasks/lxc-betam.yml | 12 ++++++------ roles/ariane/tasks/lxc-zyklon.yml | 14 ++++++++++++++ roles/ariane/tasks/main.yml | 4 ++++ .../lxc-betam.conf.j2} | 9 ++++++++- 5 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 roles/ariane/files/lxc-zyklon.conf create mode 100644 roles/ariane/tasks/lxc-zyklon.yml rename roles/ariane/{files/lxc-betam.conf => templates/lxc-betam.conf.j2} (66%) diff --git a/roles/ariane/files/lxc-zyklon.conf b/roles/ariane/files/lxc-zyklon.conf new file mode 100644 index 0000000..092ffb6 --- /dev/null +++ b/roles/ariane/files/lxc-zyklon.conf @@ -0,0 +1,15 @@ +# {{ ansible_managed }} + +lxc.network.type = veth +lxc.network.link = br0 +lxc.network.flags = up +lxc.network.hwaddr = 2e:6d:b6:07:15:01 + +lxc.aa_profile = unconfined +lxc.rootfs = /var/lib/lxc/lxc-zyklon-01/rootfs +lxc.rootfs.backend = dir + +lxc.include = /usr/share/lxc/config/voidlinux.common.conf + +lxc.utsname = lxc-zyklon-01 +lxc.arch = amd64 diff --git a/roles/ariane/tasks/lxc-betam.yml b/roles/ariane/tasks/lxc-betam.yml index a3eb837..d20acd9 100644 --- a/roles/ariane/tasks/lxc-betam.yml +++ b/roles/ariane/tasks/lxc-betam.yml @@ -1,13 +1,13 @@ --- -#- name: lxc - betam container -# lxc_container: -# name: betam -# template: debian +- name: lxc - betam container + lxc_container: + name: lxc-betam-01 + template: debian - name: lxc - betam config - copy: + template: dest: /var/lib/lxc/lxc-betam-01/config - src: lxc-betam.conf + src: lxc-betam.conf.j2 owner: root group: root mode: 0644 diff --git a/roles/ariane/tasks/lxc-zyklon.yml b/roles/ariane/tasks/lxc-zyklon.yml new file mode 100644 index 0000000..709b26b --- /dev/null +++ b/roles/ariane/tasks/lxc-zyklon.yml @@ -0,0 +1,14 @@ +--- +- name: lxc - zyklon container + lxc_container: + name: lxc-zyklon-01 + template: voidlinux + +- name: lxc - zyklon config + copy: + dest: /var/lib/lxc/lxc-zyklon-01/config + src: lxc-zyklon.conf + owner: root + group: root + mode: 0644 + backup: yes diff --git a/roles/ariane/tasks/main.yml b/roles/ariane/tasks/main.yml index 79a9ff0..4988654 100644 --- a/roles/ariane/tasks/main.yml +++ b/roles/ariane/tasks/main.yml @@ -27,6 +27,10 @@ when: ariane_lxc tags: ['ariane_lxc', 'lxc'] +- include_tasks: lxc-zyklon.yml + when: ariane_lxc + tags: ['ariane_lxc', 'lxc'] + - include_tasks: snapper.yml when: ariane_snapper tags: ['ariane_snapper', 'snapper'] diff --git a/roles/ariane/files/lxc-betam.conf b/roles/ariane/templates/lxc-betam.conf.j2 similarity index 66% rename from roles/ariane/files/lxc-betam.conf rename to roles/ariane/templates/lxc-betam.conf.j2 index a18cdaf..49ca8c0 100644 --- a/roles/ariane/files/lxc-betam.conf +++ b/roles/ariane/templates/lxc-betam.conf.j2 @@ -6,7 +6,7 @@ lxc.network.flags = up lxc.network.hwaddr = 2e:6d:b6:07:14:01 lxc.aa_profile = unconfined -lxc.rootfs = /var/lib/lxc/lxc-betam-01/rootfs +lxc.rootfs = /var/lib/lxc/lxc-{{ lxc_host }}-01/rootfs lxc.rootfs.backend = dir lxc.include = /usr/share/lxc/config/debian.common.conf @@ -15,3 +15,10 @@ lxc.utsname = lxc-betam-01 lxc.arch = amd64 lxc.cgroup.devices.allow = c 188:0 rwm + + +lxc_host: betam +lxc_rev: 01 +lxc_hwaddr: 2e:6d:b6:07:14:01 +lxc_extra: lxc.cgroup.devices.allow = c 188:0 rwm +