diff --git a/ansible/roles/appliance/tasks/dependencies.yml b/ansible/roles/appliance/tasks/dependencies.yml index 18b9702..cb7f86a 100644 --- a/ansible/roles/appliance/tasks/dependencies.yml +++ b/ansible/roles/appliance/tasks/dependencies.yml @@ -31,7 +31,7 @@ - name: Install distro packages ansible.builtin.apt: - pkg: "{{ dependencies.packages }}" + pkg: "{{ dependencies.packages.apt }}" state: latest update_cache: yes install_recommends: no @@ -42,6 +42,11 @@ state: latest update_cache: yes +- name: Install additional python packages + ansible.builtin.pip: + name: "{{ dependencies.packages.pip }}" + state: latest + - name: Cleanup apt cache ansible.builtin.apt: autoremove: yes diff --git a/ansible/roles/os/tasks/ansible.yml b/ansible/roles/os/tasks/ansible.yml deleted file mode 100644 index e6efa1b..0000000 --- a/ansible/roles/os/tasks/ansible.yml +++ /dev/null @@ -1,6 +0,0 @@ -- name: Install ansible (w/ dependencies) - ansible.builtin.pip: - name: "{{ item }}" - executable: pip3 - state: latest - loop: "{{ pip_packages }}" diff --git a/ansible/roles/os/tasks/main.yml b/ansible/roles/os/tasks/main.yml index a8b4361..4f100f7 100644 --- a/ansible/roles/os/tasks/main.yml +++ b/ansible/roles/os/tasks/main.yml @@ -15,6 +15,3 @@ - name: Install packages import_tasks: packages.yml - -- name: Install ansible - import_tasks: ansible.yml diff --git a/ansible/roles/os/tasks/packages.yml b/ansible/roles/os/tasks/packages.yml index ce1f212..c0702ac 100644 --- a/ansible/roles/os/tasks/packages.yml +++ b/ansible/roles/os/tasks/packages.yml @@ -13,8 +13,10 @@ - name: Install additional python packages ansible.builtin.pip: - name: "{{ packages.pip }}" + name: "{{ item }}" + executable: pip3 state: latest + loop: "{{ packages.pip }}" - name: Cleanup ansible.builtin.apt: diff --git a/ansible/roles/os/vars/main.yml b/ansible/roles/os/vars/main.yml index c01c790..78c6ea5 100644 --- a/ansible/roles/os/vars/main.yml +++ b/ansible/roles/os/vars/main.yml @@ -1,11 +1,13 @@ packages: - - jq - # (python3-*) Dependency for installation of Ansible - - python3-pip - - python3-setuptools - - python3-wheel - -pip_packages: - - pip - - ansible-core - - lxml + apt: + - jq + # (python3-*) Dependency for installation of Ansible + - python3-pip + # - python3-setuptools + # - python3-wheel + pip: + - ansible-core + - lxml + - pip + - setuptools + - wheel