roles/server/tasks/networkd.yaml

@@ -1,97 +1,99 @@
 ---
-- name: Configure network settings
+- name: Install systemd-networkd on Rocky
   become: true
-  block:
+  ansible.builtin.dnf:
-    - name: Install systemd-networkd on Rocky
+    name: systemd-networkd
-      ansible.builtin.dnf:
+    state: present
-        name: systemd-networkd
-        state: present
 
-    - name: Ensure network config directory exists
+- name: Ensure network config directory exists
-      ansible.builtin.file:
+  ansible.builtin.file:
-        path: /etc/systemd/network
+    path: /etc/systemd/network
-        state: directory
+    state: directory
-        owner: root
+    owner: root
-        group: root
+    group: root
-        mode: 0755
+    mode: 0644
 
-    - name: Create network files
+- name: Create network files
-      ansible.builtin.template:
+  become: true
-        src: network.j2
+  ansible.builtin.template:
-        dest: /etc/systemd/network/{{ item.key }}.network
+    src: network.j2
-        mode: 0644
+    dest: /etc/systemd/network/{{ item.key }}.network
-        owner: root
+    mode: 0644
-        group: "{{ ansible_user }}"
+    owner: root
-      loop: "{{ skylab_networking.interfaces | dict2items }}"
+    group: "{{ ansible_user }}"
-      loop_control:
+  loop: "{{ skylab_networking.interfaces | dict2items }}"
-        label: "{{ item.key }}"
 
-    - name: Create netdev files
+- name: Create netdev files
-      when: item.value.type is defined
+  become: true
-      ansible.builtin.template:
+  when: item.kind is defined
-        src: netdev.j2
+  ansible.builtin.template:
-        dest: /etc/systemd/network/{{ item.key }}.netdev
+    src: netdev.j2
-        mode: 0644
+    dest: /etc/systemd/network/{{ item.key }}.netdev
-        owner: root
+    mode: 0644
-        group: "{{ ansible_user }}"
+    owner: root
-      loop: "{{ skylab_networking.interfaces | dict2items }}"
+    group: "{{ ansible_user }}"
-      loop_control:
+  loop: "{{ skylab_networking.interfaces | dict2items }}"
-        label: "{{ item.key }}"
 
-    - name: Fetch existing network config directory contents
+- name: Fetch existing network config directory contents
-      changed_when: false
+  become: true
-      ansible.builtin.command:
+  changed_when: false
-        cmd: /usr/bin/ls /etc/systemd/network
+  ansible.builtin.command:
-      register: _network_config_dir_raw
+    cmd: /usr/bin/ls /etc/systemd/network
+  register: _network_config_dir_raw
 
-    - name: Remove legacy network config files
+- name: Remove legacy network config files
-      when: item.strip().replace('.netdev', '').replace('.network', '') not in skylab_networking.interfaces
+  become: true
-      ansible.builtin.file:
+  when: item.strip().replace('.netdev', '').replace('.network', '') not in skylab_networking.interfaces
-        path: /etc/systemd/network/{{ item }}
+  ansible.builtin.file:
-        state: absent
+    path: /etc/systemd/network/{{ item }}
-      loop: "{{ _network_config_dir_raw.stdout_lines }}"
+    state: absent
-      loop_control:
+  loop: "{{ _network_config_dir_raw.stdout.split(' ') }}"
-        label: "{{ item.strip() }}"
 
-    - name: Configure fallback DNS
+- name: Configure fallback DNS
-      ansible.builtin.lineinfile:
+  become: true
-        path: /etc/systemd/resolved.conf
+  ansible.builtin.lineinfile:
-        create: false
+    path: /etc/systemd/resolved.conf
-        line: FallbackDNS=
+    create: false
+    line: FallbackDNS=
 
-    - name: Enable systemd-networkd
+- name: Enable systemd-networkd
-      ansible.builtin.systemd:
+  become: true
-        name: "{{ item }}"
+  ansible.builtin.systemd:
-        enabled: true
+    name: "{{ item }}"
-      loop:
+    enabled: true
-        - systemd-networkd
+  loop:
-        - systemd-networkd-wait-online
+    - systemd-networkd
-        - systemd-resolved
+    - systemd-networkd-wait-online
+    - systemd-resolved
 
-    - name: Disable NetworkManager
+- name: Disable NetworkManager
-      ansible.builtin.systemd:
+  become: true
-        name: "{{ item }}"
+  ansible.builtin.systemd:
-        enabled: false
+    name: "{{ item }}"
-      loop:
+    enabled: false
-        - NetworkManager
+  loop:
-        - NetworkManager-wait-online
+    - NetworkManager
+    - NetworkManager-wait-online
 
-    - name: Start systemd-resolved to enable symlink creation
+- name: Start systemd-resolved to enable symlink creation
-      ansible.builtin.systemd:
+  become: true
-        name: systemd-resolved
+  ansible.builtin.systemd:
-        state: started
+    name: systemd-resolved
+    state: started
 
-    - name: Link system resolv.conf to systemd-resolved
+- name: Link system resolv.conf to systemd-resolved
-      ansible.builtin.file:
+  become: true
-        dest: /etc/resolv.conf
+  ansible.builtin.file:
-        src: /run/systemd/resolve/resolv.conf
+    dest: /etc/resolv.conf
-        state: link
+    src: /run/systemd/resolve/resolv.conf
-        force: true
+    state: link
-        setype: net_conf_t
+    force: true
+    setype: net_conf_t
 
-    - name: Link systemd-resolved to multi-user target
+- name: Link systemd-resolved to multi-user target
-      ansible.builtin.file:
+  become: true
-        dest: /etc/systemd/system/multi-user.target.wants/systemd-resolved.service
+  ansible.builtin.file:
-        src: /usr/lib/systemd/system/systemd-resolved.service
+    dest: /etc/systemd/system/multi-user.target.wants/systemd-resolved.service
-        state: link
+    src: /usr/lib/systemd/system/systemd-resolved.service
-        force: true
+    state: link
+    force: true

roles/server/tasks/sudoers.yaml

@@ -25,6 +25,6 @@
   ansible.builtin.file:
     path: /etc/sudoers.d/{{ item.strip() }}
     state: absent
-  loop: "{{ _sudoers_files_raw.stdout_lines }}"
+  loop: "{{ _sudoers_files_raw.stdout.split(' ') }}"
   loop_control:
     label: "/etc/sudoers.d/{{ item.strip() }}"

roles/server/templates/network.j2

@@ -14,15 +14,17 @@ DNS={{ server }}
 {% if item.value.bond is defined %}
 Bond={{ item.value.bond }}
 {% endif %}
-{% if item.value.dhcp | default(false) %}
 
+{% if item.value.dhcp | default(false) %}
 Gateway={{ item.value.gateway | ansible.netcommon.ipaddr('address') }}
 {% for address in item.value.addresses %}
 Address={{ address | ansible.netcommon.ipaddr('host/prefix') }}
 {% endfor %}
 {% endif %}
+
+
 {% for interface in skylab_networking.interfaces.keys() %}
-{% if interface.startswith(item.key) and interface.partition('.')[2] | regex_search('^[0-9]{1,4}$') and interface != item.key %}
+{% if interface.startswith(item.key) and interface.partition('.')[2] | number %}
 VLAN={{ interface }}
 {% endif %}
 {% endfor %}