michael/IaC
1
0
Fork 0
Code Packages

refine systemd_networkd

Browse Source
This commit is contained in:
michael 2023-08-12 20:19:07 +10:00
parent 24f3a7c485
commit a2ec933cf8
15 changed files with 97 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/inventory/group_vars/all/all.yaml
View File

@ -1,15 +1 @@
--- ---
# connection
ansible_connection: ssh
ansible_become_method: sudo
ansible_become_user: root
ansible_port: 22
zfs_packages:
- linux-lts-headers
- openssl-1.1
- zfs-utils
- zfs-dkms
- smartmontools
zfs_key_id: DDF7DB817396A49B2A2723F7403BD972F75D9D76

16
ansible/inventory/host_vars/hv00.balsillie.house/ansible_connection.yaml Normal file
View File

@ -0,0 +1,16 @@
$ANSIBLE_VAULT;1.1;AES256
30653030376238643536303332376530306565363333613230303263653935626332383862646539
3739623265323837613333343363343461353837643637650a616637656563313265636366616134
61636335613330393239656262663735316365613435303766643964353964666537353338646666
3536363034316632390a363234343466363937613631316130333566313037306636386130303137
33366462303461393866633233643033356231343232313832636335336232383234626163623533
64656339346264306265353839373362373034306261316238346365373639326566313866363263
62613639313566373233303734666331633038383638316361353838313634383163626563333137
62393835663963646431353431396238663062363031613735623937373835383630653165373634
32356365363162333661323765333236363934636461366664666431333338326362656439366339
62313265616666386164343336623032386536343134336232613164363236656236646332356335
36643362613832656666376233363436313030626566356134306533643862333536336662653630
32663936333434346530343639383330633538306536346432333136393765316366356362353735
30636536333436346166616232643238373964306139313265623934616636663234336162306338
34343934613136623837353436353462303036643837656636386533333266663265643538633333
373133383866666465383332373336343739

6
ansible/inventory/host_vars/hv00.balsillie.house/hypervisor.yaml Normal file
View File

@ -0,0 +1,6 @@
hypervisor:
storage: dir
device: /dev/sda
qemu_bridges:
- br0

1
ansible/inventory/host_vars/hv00.balsillie.house/serial_console.yaml Normal file
View File

@ -0,0 +1 @@
console_device: ttyS0

13
ansible/inventory/host_vars/hv00_balsillie_home/hv00_balsillie_house.yaml → ansible/inventory/host_vars/hv00.balsillie.house/systemd_networkd.yaml
View File

@ -52,7 +52,7 @@ systemd_networkd_configs:
mac_address: 64-62-66-21-e9-c6 mac_address: 64-62-66-21-e9-c6
arp: false arp: false
lldp: false lldp: false
dhcp: false dhcp: true
- name: 10-br0.netdev - name: 10-br0.netdev
src: bridge.netdev.j2 src: bridge.netdev.j2
vlan_filtering: true vlan_filtering: true
@ -63,7 +63,7 @@ systemd_networkd_configs:
dhcp: false dhcp: false
lldp: true lldp: true
vlans: vlans:
- 110 - vlan110
- name: 20-vlan110.netdev - name: 20-vlan110.netdev
src: vlan.netdev.j2 src: vlan.netdev.j2
vlan_id: 110 vlan_id: 110
@ -80,12 +80,3 @@ systemd_networkd_configs:
nameserver: nameserver:
ipv4: ipv4:
- 10.192.110.254 - 10.192.110.254
qemu_bridges:
- br0
hypervisor:
storage: dir
device: /dev/sda
console_device: ttyS0

110
ansible/inventory/inventory.yaml
View File

@ -2,100 +2,100 @@ all:
children: children:
ups: ups:
hosts: hosts:
ups00_balsillie_house: ups00.balsillie.house:
firewalls: firewalls:
children: children:
opnsense: opnsense:
hosts: hosts:
fw00_balsillie_net: fw00.balsillie.net:
openwrt: openwrt:
hosts: hosts:
fw00_balsillie_house: fw00.balsillie.house:
switches: switches:
hosts: hosts:
sw00_balsillie_house: sw00.balsillie.house:
waps: waps:
hosts: hosts:
wap00_balsillie_house: wap00.balsillie.house:
virtual_machines: virtual_machines:
hosts: hosts:
kube01_balsillie_net: kube01.balsillie.net:
kube02_balsillie_net: kube02.balsillie.net:
kube03_balsillie_net: kube03.balsillie.net:
fw00_balsillie_net: fw00.balsillie.net:
fw00_balsillie_house: fw00.balsillie.house:
mp00_balsillie_house: mp00.balsillie.house:
win11_balsillie_house: win11.balsillie.house:
bare_metal: bare_metal:
hosts: hosts:
ups00_balsillie_house: ups00.balsillie.house:
sw00_balsillie_house: sw00.balsillie.house:
wap00_balsillie_house: wap00.balsillie.house:
hv00_balsillie_house: hv00.balsillie.house:
hv00_balsillie_net: hv00.balsillie.net:
lat5420_balsillie_house: lat5420.balsillie.house:
lat7490_balsillie_house: lat7490.balsillie.house:
sff_balsillie_house: sff.balsillie.house:
servers: servers:
children: children:
hypervisors: hypervisors:
hosts: hosts:
hv00_balsillie_net: # Hetzner hv00.balsillie.net: # Hetzner
hv00_balsillie_house: # vp2420 hv00.balsillie.house: # vp2420
hv01_balsillie_net: # 4U Rosewill hv01.balsillie.net: # 4U Rosewill
k8s: k8s:
children: children:
k8s_control: k8s_control:
hosts: hosts:
kube01_balsillie_net: kube01.balsillie.net:
kube02_balsillie_net: kube02.balsillie.net:
kube03_balsillie_net: kube03.balsillie.net:
k8s_taint: k8s_taint:
hosts: hosts:
kube01_balsillie_net: kube01.balsillie.net:
kube02_balsillie_net: kube02.balsillie.net:
kube03_balsillie_net: kube03.balsillie.net:
k8s_worker: k8s_worker:
hosts: hosts:
kube01_balsillie_net: kube01.balsillie.net:
kube02_balsillie_net: kube02.balsillie.net:
kube03_balsillie_net: kube03.balsillie.net:
k8s_storage: k8s_storage:
hosts: hosts:
kube01_balsillie_net: kube01.balsillie.net:
kube02_balsillie_net: kube02.balsillie.net:
kube03_balsillie_net: kube03.balsillie.net:
workstations: workstations:
children: children:
arch: arch:
hosts: hosts:
lat5420_balsillie_house: lat5420.balsillie.house:
sff_balsillie_house: sff.balsillie.house:
mp00_balsillie_house: mp00.balsillie.house:
windows: windows:
hosts: hosts:
lat7490_balsillie_house: lat7490.balsillie.house:
win11_balsillie_house: win11.balsillie.house:
laptops: laptops:
hosts: hosts:
lat5420_balsillie_house: lat5420.balsillie.house:
lat7490_balsillie_house: lat7490.balsillie.house:
desktops: desktops:
hosts: hosts:
sff_balsillie_house: sff.balsillie.house:
mp00_balsillie_house: mp00.balsillie.house:
hetzner: hetzner:
hosts: hosts:
fw00_balsillie_net: fw00.balsillie.net:
hv00_balsillie_net: hv00.balsillie.net:
kube01_balsillie_net: kube01.balsillie.net:
kube02_balsillie_net: kube02.balsillie.net:
kube03_balsillie_net: kube03.balsillie.net:
house: house:
hosts: hosts:
hv00_balsillie_house: hv00.balsillie.house:
fw00_balsillie_house: fw00.balsillie.house:
mp00_balsillie_house: mp00.balsillie.house:
win11_balsillie_house: win11.balsillie.house:
lat5420_balsillie_house: lat5420.balsillie.house:
sff_balsillie_house: sff.balsillie.house:

14
ansible/playbooks/vp2420.yaml
View File

@ -5,20 +5,20 @@
# Systemd networking # Systemd networking
- name: Setup systemd-networkd - name: Setup systemd-networkd
hosts: hv00_balsillie_house hosts: hv00.balsillie.house
become: true become: true
roles: roles:
- name: systemd_networkd - name: systemd_networkd
vars: vars:
ansible_host: # TODO add temp address ansible_host: 192.168.1.106
# Serial console # Serial console
- name: Setup serial console # - name: Setup serial console
hosts: hv00_balsillie_house # hosts: hv00_balsillie_house
become: true # become: true
roles: # roles:
- name: serial_console # - name: serial_console
# Hypervisor setup # Hypervisor setup

1
ansible/roles/archinstall/tasks/main.yml
View File

@ -39,6 +39,7 @@
# pacstrap # pacstrap
# pacstrap -K /mnt/root base linux-lts linux-firmware nano openssh bind bash efibootmgr reflector screen pv pinentry sudo man-db man-pages texinfo ufw nftables intel-ucode e2fsprogs dosfstools curl cryptsetup # pacstrap -K /mnt/root base linux-lts linux-firmware nano openssh bind bash efibootmgr reflector screen pv pinentry sudo man-db man-pages texinfo ufw nftables intel-ucode e2fsprogs dosfstools curl cryptsetup
# sbctl fwupd fwupd-efi dmidecode udisks2
# gen fstab # gen fstab
# genfstab -L /mnt/root >> /mnt/root/etc/fstab # genfstab -L /mnt/root >> /mnt/root/etc/fstab

0
ansible/roles/serial_out/defaults/main.yaml → ansible/roles/serial_console/defaults/main.yaml
View File

0
ansible/roles/serial_out/handlers/main.yaml → ansible/roles/serial_console/handlers/main.yaml
View File

0
ansible/roles/serial_out/tasks/main.yaml → ansible/roles/serial_console/tasks/main.yaml
View File

2
ansible/roles/systemd_networkd/defaults/main.yaml
View File

@ -1,3 +1,3 @@
default_network_services: default_network_services:
Archlinux: Archlinux:
NetworkManager - NetworkManager.service

4
ansible/roles/systemd_networkd/tasks/main.yaml
View File

@ -23,7 +23,11 @@
- Restart systemd-resolved - Restart systemd-resolved
- Restart systemd-networkd - Restart systemd-networkd
- name: Get service facts
ansible.builtin.service_facts:
- name: Disable non-systemd networking services - name: Disable non-systemd networking services
when: item in ansible_facts.services
ansible.builtin.service: ansible.builtin.service:
name: "{{ item }}" name: "{{ item }}"
state: stopped state: stopped

2
ansible/roles/systemd_networkd/templates/bridge.network.j2
View File

@ -10,6 +10,6 @@ LinkLocalAddressing=False
LLDP={{ item.lldp | default(true) }} LLDP={{ item.lldp | default(true) }}
{% if item.vlans is defined -%} {% if item.vlans is defined -%}
{% for vlan in item.vlans -%} {% for vlan in item.vlans -%}
VLAN={{ item.vlan }} VLAN={{ vlan }}
{% endfor -%} {% endfor -%}
{% endif -%} {% endif -%}

2
ansible/roles/zfs-install/defaults/main.yml
View File

@ -17,3 +17,5 @@ zfs_zpool_type: mirror
zfs_zpool_disk_a: /dev/disk/by-id/ata-Samsung_SSD_850_PRO_2TB_S3D4NX0J503633V zfs_zpool_disk_a: /dev/disk/by-id/ata-Samsung_SSD_850_PRO_2TB_S3D4NX0J503633V
zfs_zpool_disk_b: /dev/disk/by-id/ata-Samsung_SSD_850_PRO_2TB_S3D4NX0J708201E zfs_zpool_disk_b: /dev/disk/by-id/ata-Samsung_SSD_850_PRO_2TB_S3D4NX0J708201E
zfs_backup_dataset: ssd/backup zfs_backup_dataset: ssd/backup
zfs_key_id: DDF7DB817396A49B2A2723F7403BD972F75D9D76