From fd704d292ad9c44990b8af39873dd72939333313 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 23 Feb 2023 03:21:10 +0100 Subject: add ele-ymir --- chaos-at-home/ch-ymir.yml | 1 - dan/ele-ymir.yml | 39 ++++++++++++++ inventory/group_vars/elevate-festival/vars.yml | 2 + inventory/host_vars/ch-ymir.yml | 8 ++- inventory/host_vars/ele-ymir.yml | 75 ++++++++++++++++++++++++++ inventory/hosts.ini | 1 + 6 files changed, 120 insertions(+), 6 deletions(-) create mode 100644 dan/ele-ymir.yml create mode 100644 inventory/host_vars/ele-ymir.yml diff --git a/chaos-at-home/ch-ymir.yml b/chaos-at-home/ch-ymir.yml index 095ff63e..1f9af09c 100644 --- a/chaos-at-home/ch-ymir.yml +++ b/chaos-at-home/ch-ymir.yml @@ -12,7 +12,6 @@ - name: Payload Setup hosts: ch-ymir roles: - - role: apt-repo/obs-studio - role: apt-repo/spreadspace - role: ws/base - role: core/admin-users diff --git a/dan/ele-ymir.yml b/dan/ele-ymir.yml new file mode 100644 index 00000000..76e55721 --- /dev/null +++ b/dan/ele-ymir.yml @@ -0,0 +1,39 @@ +--- +- name: Basic Setup + hosts: ele-ymir + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + - role: core/cpu-microcode + +- name: Payload Setup + hosts: ele-ymir + roles: + - role: apt-repo/spreadspace + - role: ws/base + - role: core/admin-users + post_tasks: + ## TODO: move to network/netplan when this is done + - name: install vlan interfaces + loop: "{{ network.vlans | dict2items }}" + loop_control: + label: "{{ item.key }} ({{ item.value | join(',') }})" + copy: + dest: "/etc/netplan/20-{{ item.key }}.yaml" + content: | + network: + vlans: + {% for vlan in item.value %} + {% set vlan_ifname = item.key + '.' + (vlan | string) %} + {% set vlan_iface = (network.interfaces | selectattr('name', 'eq', vlan_ifname)) %} + {{ vlan_ifname }}: + id: {{ vlan }} + link: {{ item.key }} + {% if vlan_iface %} + addresses: + - {{ (vlan_iface | first).address }} + {% endif %} + {% endfor %} diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 0d2ee847..6f731e1c 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -18,6 +18,7 @@ network_zones: ele-dione: 204 ele-telesto: 205 ele-hyperion: 206 + ele-ymir: 207 ele-winvm: 209 ele-tsdatacop: 210 ele-hpws-maxi: 211 @@ -49,6 +50,7 @@ network_zones: ele-dione: 204 ele-telesto: 205 ele-hyperion: 206 + ele-ymir: 207 ele-tsdatacop: 210 ele-hpws-maxi: 211 ele-hpws-mini1: 212 diff --git a/inventory/host_vars/ch-ymir.yml b/inventory/host_vars/ch-ymir.yml index ccef3bd7..17920860 100644 --- a/inventory/host_vars/ch-ymir.yml +++ b/inventory/host_vars/ch-ymir.yml @@ -58,9 +58,7 @@ base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" admin_users_host: - equinox -ws_base_extra_packages: - # needs apt-repo/obs-studio - - obs-studio +# ws_base_extra_packages: [] # ws_base_lightdm_defaults: # autologin-user: operator @@ -68,8 +66,8 @@ ws_base_extra_packages: # ws_base_xrandr_setup_script: | # #!/bin/bash - +# # xrandr --output DP-3 --mode 1366x768 --primary # xrandr --output HDMI-1 --mode 1920x1080 --rate 50 --right-of DP-3 - +# # exit 0 diff --git a/inventory/host_vars/ele-ymir.yml b/inventory/host_vars/ele-ymir.yml new file mode 100644 index 00000000..9d131052 --- /dev/null +++ b/inventory/host_vars/ele-ymir.yml @@ -0,0 +1,75 @@ +--- +ubuntu_autoinstall_locale: de_AT +ubuntu_autoinstall_keyboard_layout: de +ubuntu_autoinstall_keyboard_variant: nodeadkeys +ubuntu_autoinstall_timezone: Europe/Vienna + +ubuntu_autoinstall_desktop: xubuntu + +install: + efi: true + disks: + primary: /dev/disk/by-id/ata-OCZ-VERTEX3_OCZ-H6D2708RV4L6CNY8 + system_lvm: + volumes: + - name: root + size: 20G + filesystem: ext4 + mountpoint: / + - name: var+log + size: 768M + filesystem: ext4 + mountpoint: /var/log + mount_options: + - noatime + - nodev + - noexec + - name: home + size: 30G + filesystem: ext4 + mountpoint: /home + kernel_cmdline: + - "consoleblank=0" + +network: + nameservers: "{{ network_zones.emc.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eno1 + address: "{{ network_zones.emc.prefix | ansible.utils.ipaddr(network_zones.emc.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.emc.gateway }}" + interfaces: + - *_network_primary_ + - name: eno1.18 + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" + vlans: + eno1: + - "{{ network_zones.lan.vlan }}" + + +apt_repo_components: + - main + - restricted + - universe + - multiverse + +base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}" + +admin_users_host: + - equinox + + +ws_base_extra_packages: + - chromium-browser + +ws_base_lightdm_defaults: + autologin-user: operator + autologin-user-timeout: 0 + +ws_base_xrandr_setup_script: | + #!/bin/bash + + xrandr --output HDMI-1 --mode 1920x1080 --primary + xrandr --output HDMI-2 --mode 1920x1080 --rate 50 --left-of HDMI1 + + exit 0 diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 21b19f68..7bd944f6 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -200,6 +200,7 @@ ele-calypso host_name=calypso ele-dione host_name=dione host_domain=elev8.at ele-helene host_name=helene ele-hyperion host_name=hyperion +ele-ymir host_name=ymir ele-tsdatacop host_name=tsdatacop ele-hpws-maxi host_name=hpws-maxi ele-hpws-mini1 host_name=hpws-mini1 -- cgit v1.2.3