From f5a258b9a1c811bbac2322250a362e2f4ebcd073 Mon Sep 17 00:00:00 2001 From: Fritz Grimpen Date: Sat, 26 Nov 2022 22:38:59 +0100 Subject: [PATCH] Changes --- bhyve.yml | 1 + debian.yml | 1 - group_vars/debian | 4 ++-- host_vars/emma.ccchb.de | 1 - host_vars/frab.emma.ccchb.de.yml | 15 +++++++++++++++ hosts/10_frab | 2 ++ site.yml | 1 + users.yml | 6 ++++++ 8 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 host_vars/frab.emma.ccchb.de.yml create mode 100644 hosts/10_frab create mode 100644 users.yml diff --git a/bhyve.yml b/bhyve.yml index 2eb4fcc..05fc900 100644 --- a/bhyve.yml +++ b/bhyve.yml @@ -3,6 +3,7 @@ - emma become: yes + tags: bhyve roles: - bhyve diff --git a/debian.yml b/debian.yml index 5e48cde..a80ff5f 100644 --- a/debian.yml +++ b/debian.yml @@ -3,4 +3,3 @@ become: yes roles: - debian - - { role: user_mgmt, tags: [user_mgmt]} diff --git a/group_vars/debian b/group_vars/debian index bc7ba4f..b4f76d2 100644 --- a/group_vars/debian +++ b/group_vars/debian @@ -1,5 +1,5 @@ --- -ansible_python_interpreter: /usr/bin/python3.7 +ansible_python_interpreter: /usr/bin/python3 dns: 213.133.98.98 8.8.8.8 ipv6_subnet: '2a01:4f8:150:926f::' @@ -8,6 +8,6 @@ ipv4_subnet: 10.0.0.0 ipv6: '{{ ipv6_subnet | ipmath(2 * (vm_index +2)+1) }}/127' ipv6route: '{{ ipv6_subnet | ipmath(2 * (vm_index +2)) }}' -ansible_ssh_host: '{{ ipv4_subnet | ipmath(2 * vm_index +1) }}' +#ansible_ssh_host: '{{ ipv4_subnet | ipmath(2 * vm_index +1) }}' ipv4: '{{ ipv4_subnet | ipmath(2 * vm_index +1) }}/31' ipv4route: '{{ ipv4_subnet | ipmath(2 * vm_index) }}' diff --git a/host_vars/emma.ccchb.de b/host_vars/emma.ccchb.de index 569c898..8caeff6 100644 --- a/host_vars/emma.ccchb.de +++ b/host_vars/emma.ccchb.de @@ -232,7 +232,6 @@ bhyve_guests: image: ubuntu-22.04.1-live-server-amd64.iso password: foobar order: - - ISO - DISKS disks: - name: disk diff --git a/host_vars/frab.emma.ccchb.de.yml b/host_vars/frab.emma.ccchb.de.yml new file mode 100644 index 0000000..3d170bb --- /dev/null +++ b/host_vars/frab.emma.ccchb.de.yml @@ -0,0 +1,15 @@ +vm_index: 9 + +user_mgmt: + crest: + state: present + groups: sudo + fritz: + state: present + groups: sudo + humm: + state: present + groups: sudo + blazr: + state: present + groups: sudo diff --git a/hosts/10_frab b/hosts/10_frab new file mode 100644 index 0000000..b0b1f7b --- /dev/null +++ b/hosts/10_frab @@ -0,0 +1,2 @@ +[frab] +frab.emma.ccchb.de \ No newline at end of file diff --git a/site.yml b/site.yml index 845bad0..7d5f227 100644 --- a/site.yml +++ b/site.yml @@ -7,3 +7,4 @@ - import_playbook: mail.yml - import_playbook: restic.yml - import_playbook: wiki.yml +- import_playbook: users.yml diff --git a/users.yml b/users.yml new file mode 100644 index 0000000..ea6b615 --- /dev/null +++ b/users.yml @@ -0,0 +1,6 @@ +--- +- hosts: debian frab + become: yes + tags: [user_mgmt] + roles: + - user_mgmt