diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 49bacdf..6543e37 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -19,22 +19,22 @@ users: password: "{{ secret_rox_pass }}" package_list: - - name: bash-completion - - name: ca-certificates - - name: curl - - name: git - - name: gnupg2 - - name: htop - - name: jq - - name: ncdu - - name: neofetch - - name: net-tools - - name: python3 - - name: python3-apt - - name: python3-pip - - name: software-properties-common - - name: tmux - - name: wget + - bash-completion + - ca-certificates + - curl + - git + - gnupg2 + - htop + - jq + - ncdu + - neofetch + - net-tools + - python3 + - python3-apt + - python3-pip + - software-properties-common + - tmux + - wget dmasq_local_domain: "{{ secret_local_domain }}" diff --git a/ansible/roles/kubernetes/tasks/node.yml b/ansible/roles/kubernetes/tasks/node.yml index 178bc49..d4aaf45 100644 --- a/ansible/roles/kubernetes/tasks/node.yml +++ b/ansible/roles/kubernetes/tasks/node.yml @@ -137,11 +137,10 @@ - name: Install kubernetes packages become: "{{ do_become }}" ansible.builtin.apt: - name: "{{ item }}={{ kube_apt }}" + name: + - kubelet={{ kube_apt }} + - kubeadm={{ kube_apt }} state: present - with_items: - - kubelet - - kubeadm - name: Hold kubernetes version become: "{{ do_become }}" diff --git a/ansible/run.yml b/ansible/run.yml index f3a73a6..8466f20 100644 --- a/ansible/run.yml +++ b/ansible/run.yml @@ -66,11 +66,8 @@ - name: Install packages when: ansible_distribution == 'Ubuntu' or ansible_distribution == 'Debian' ansible.builtin.apt: - name: "{{ item.name | default(omit) }}" + name: "{{package_list}}" state: latest - default_release: "{{ item.default_release | default(omit) }}" - with_items: - - "{{package_list}}" - name: Install pip packages ansible.builtin.pip: @@ -179,7 +176,16 @@ - name: Install packages become: "{{ do_become }}" ansible.builtin.apt: - name: libraspberrypi-bin + name: "{{ item }}" + loop: + - libraspberrypi-bin + - linux-modules-extra-raspi + - vlan + + - name: Add the 802.1q module + community.general.modprobe: + name: 8021q + state: present - name: Place PoE fan file become: "{{ do_become }}"