From fd23c5c4b0e9a48b9cc04355a0b9b1bf85f9fe41 Mon Sep 17 00:00:00 2001 From: L3D Date: Thu, 11 Mar 2021 23:00:50 +0100 Subject: [PATCH] update to new ansible name scheme --- .gitignore | 1 + defaults/main.yml | 5 +++-- tasks/main.yml | 13 +++++++------ tasks/versioncheck.yml | 18 +++++++++--------- 4 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..16d3c4d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.cache diff --git a/defaults/main.yml b/defaults/main.yml index 0242467..87a155c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,6 @@ --- # Do we want a password manager installed? install_pass_as_password_manager: false -# version check for this role? -submodules_versioncheck: true + +# version check for this role? (true is recomended) +submodules_versioncheck: false diff --git a/tasks/main.yml b/tasks/main.yml index 9bef6e2..bc09dbe 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,31 +1,32 @@ --- -- include_tasks: versioncheck.yml +- name: Perform optional versionscheck + ansible.builtin.include_tasks: versioncheck.yml when: submodules_versioncheck|bool - name: Include OS Specific vars - include_vars: "{{ ansible_distribution }}.yml" + ansible.builtin.include_vars: "{{ ansible_distribution }}.yml" - name: Install firefox become: true - package: + ansible.builtin.package: name: "{{ firefox_package_name }}" state: present - name: Install firefox language german, if package available become: true - package: + ansible.builtin.package: name: "{{ firefox_language }}" state: present - name: Install firefox plugins, if package available become: true - package: + ansible.builtin.package: name: "{{ firefox_plugins }}" state: present - name: Install Password manager, if whished become: true - package: + ansible.builtin.package: name: "{{ password_manager_packages }}" state: present when: install_pass_as_password_manager|bool diff --git a/tasks/versioncheck.yml b/tasks/versioncheck.yml index 7977e52..dca3e47 100644 --- a/tasks/versioncheck.yml +++ b/tasks/versioncheck.yml @@ -1,7 +1,7 @@ --- - name: Create directory for versionscheck become: true - file: + ansible.builtin.file: path: '/etc/.ansible-version' state: directory mode: 0755 @@ -9,38 +9,38 @@ - name: check playbook version become: true - slurp: + ansible.builtin.slurp: src: "/etc/.ansible-version/{{ playbook_version_path }}" register: playbook_version when: submodules_versioncheck|bool - ignore_errors: yes + ignore_errors: true failed_when: false - name: Print remote role version - debug: + ansible.builtin.debug: msg: "Remote role version: {{ playbook_version.content | default('Y3VycmVudGx5IG5vdCBkZXBsb3llZAo=') | b64decode | string }}" when: submodules_versioncheck|bool - name: Print locale role version - debug: + ansible.builtin.debug: msg: "Local role version: '{{ playbook_version_number|string }}'." when: submodules_versioncheck|bool - name: Check if your version is outdated - fail: + ansible.builtin.fail: msg: "Your ansible module has the version '{{ playbook_version_number }}' and is outdated. You need to update it!" when: - playbook_version.content|default("Mgo=")|b64decode|int - 1 >= playbook_version_number|int and submodules_versioncheck|bool - name: check if '/etc/ansible-version/' is empty - find: + ansible.builtin.find: paths: '/etc/ansible-version/' register: filesFound - name: write new version to remote disk become: true - copy: + ansible.builtin.copy: content: "{{ playbook_version_number }}" dest: "/etc/.ansible-version/{{ playbook_version_path }}" - mode: 0644 + mode: '0644' when: submodules_versioncheck|bool