diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index fd5cf75..3a958ad 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -1,4 +1,5 @@ [defaults] +stdout_callback = default display_skipped_hosts = false ansible_python_interpreter = /usr/bin/python3 diff --git a/ansible/main.yml b/ansible/main.yml index b218398..8ec4951 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -1,8 +1,8 @@ --- -- become: "yes" +- become: true become_method: sudo debugger: never - gather_facts: "yes" + gather_facts: true hosts: all roles: - base diff --git a/ansible/roles/base/tasks/debian.yml b/ansible/roles/base/tasks/debian.yml index 4f88c25..5314222 100644 --- a/ansible/roles/base/tasks/debian.yml +++ b/ansible/roles/base/tasks/debian.yml @@ -1,17 +1,13 @@ --- -- name: "Updating the guest operating system." - apt: - force_apt_get: true - name: "*" - state: latest # noqa package-latest - update_cache: "yes" +- block: + - name: "Updating the guest operating system." + ansible.builtin.apt: + force_apt_get: true + name: "*" + state: latest # noqa package-latest + update_cache: "yes" -- name: "Installing additional packages." - apt: - name: - - bash-completion - - curl - - wget - - unzip - - ca-certificates - state: latest # noqa package-latest + - name: "Installing additional packages." + ansible.builtin.apt: + name: "{{ additional_packages[ansible_os_family] }}" + state: latest # noqa package-latest diff --git a/ansible/roles/base/tasks/redhat.yml b/ansible/roles/base/tasks/redhat.yml index bebfa01..c2b27f5 100644 --- a/ansible/roles/base/tasks/redhat.yml +++ b/ansible/roles/base/tasks/redhat.yml @@ -4,38 +4,16 @@ ansible.builtin.shell: "subscription-manager refresh" when: "ansible_facts['distribution'] == 'RedHat'" -- name: "Updating the guest operating system." - ansible.builtin.dnf: - name: "*" - state: latest # noqa package-latest - update_cache: "yes" - when: "ansible_facts['distribution_major_version'] >= \"8\"" +- block: + - name: "Updating the guest operating system." + ansible.builtin.dnf: + name: "*" + state: latest # noqa package-latest + update_cache: "yes" -- name: "Installing additional packages." - ansible.builtin.dnf: - name: - - curl - - wget - - unzip - - ca-certificates - state: latest # noqa package-latest - when: "ansible_facts['distribution_major_version'] >= \"8\"" + - name: "Installing additional packages." + ansible.builtin.dnf: + name: "{{ additional_packages[ansible_os_family] }}" + state: latest # noqa package-latest + when: ansible_distribution_major_version | int > 8 -- name: "Updating the guest operating system." - when: "ansible_facts['distribution_major_version'] <= \"7\"" - ansible.builtin.yum: - name: "*" - state: latest # noqa package-latest - update_cache: "yes" - -- name: "Installing additional packages." - when: "ansible_facts['distribution_major_version'] <= \"7\"" - ansible.builtin.yum: - name: - - curl - - wget - - unzip - - ca-certificates - state: latest # noqa package-latest - -... \ No newline at end of file diff --git a/ansible/roles/base/tasks/ubuntu.yml b/ansible/roles/base/tasks/ubuntu.yml index 4f88c25..502d180 100644 --- a/ansible/roles/base/tasks/ubuntu.yml +++ b/ansible/roles/base/tasks/ubuntu.yml @@ -8,10 +8,5 @@ - name: "Installing additional packages." apt: - name: - - bash-completion - - curl - - wget - - unzip - - ca-certificates + name: "{{ additional_packages[ansible_os_family] }}" state: latest # noqa package-latest diff --git a/ansible/roles/base/vars/main.yml b/ansible/roles/base/vars/main.yml new file mode 100644 index 0000000..0d2cbc6 --- /dev/null +++ b/ansible/roles/base/vars/main.yml @@ -0,0 +1,20 @@ +--- +task_name: "Update the operating system and install additional packages." +additional_packages: + Debian: + - bash-completion + - ca-certificates + - curl + - unzip + - wget + RedHat: + - ca-certificates + - curl + - unzip + - wget + Ubuntu: + - bash-completion + - ca-certificates + - curl + - unzip + - wget