From d8e1c4b2769f071e4958977fa1fe7064c07bd745 Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 9 Mar 2020 17:51:33 +0100 Subject: [PATCH] kick out legacy part of versionscheck --- .github/FUNDING.yml | 1 - defaults/main.yml | 6 +++--- tasks/versioncheck.yml | 23 ----------------------- vars/main.yml | 4 ++-- 4 files changed, 5 insertions(+), 29 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 74f2231..51ba466 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -2,4 +2,3 @@ github: [do1jlr] liberapay: L3D -custom: ['https://paypal.me/c3woc'] diff --git a/defaults/main.yml b/defaults/main.yml index 9c7741d..e6d69d8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,7 +6,7 @@ install_weechat: true configure_weechat: true # user to install and use weechat -weechat_user: "{{ ansible_user_id }}" +weechat_user: "{{ ansible_user_id }}" # where is our home direcotory for weechat weechat_directory: "/home/{{ weechat_user }}/.weechat" @@ -14,5 +14,5 @@ weechat_directory: "/home/{{ weechat_user }}/.weechat" # plugins we want weechat_plugins: [] -# version check for this role? -submodules_versioncheck: true +# version check for this role? (true is recomended) +submodules_versioncheck: false diff --git a/tasks/versioncheck.yml b/tasks/versioncheck.yml index 9cfdbba..9895582 100644 --- a/tasks/versioncheck.yml +++ b/tasks/versioncheck.yml @@ -7,15 +7,6 @@ mode: 0755 when: submodules_versioncheck|bool -- name: check legacy playbook version - become: true - slurp: - src: "/etc/ansible-version/{{ playbook_version_path }}" - register: legacy_playbook_version - when: submodules_versioncheck|bool - ignore_errors: yes - changed_when: False - - name: check playbook version become: true slurp: @@ -39,26 +30,12 @@ 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 - - legacy_playbook_version.content|default("Mgo=")|b64decode|int - 1 >= playbook_version_number|int and submodules_versioncheck|bool - -- name: delete legacy version if needed - become: true - file: - state: absent - path: "/etc/ansible-version/{{ playbook_version_path }}" - name: check if '/etc/ansible-version/' is empty find: paths: '/etc/ansible-version/' register: filesFound -- name: delete legacy version folder if needed - become: true - file: - state: absent - path: "/etc/ansible-version" - when: filesFound.matched < 0 - - name: write new version to remote disk become: true copy: diff --git a/vars/main.yml b/vars/main.yml index 5dd135d..62c4ba1 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -9,5 +9,5 @@ weechat_plugin_languages: lua: lua # version management -playbook_version_number: 1028 # should be over ninethousand -playbook_version_path: 'role-weechat_chaos-bodensee_github.com.version' +playbook_version_number: 2048 # should be over ninethousand +playbook_version_path: 'role-weechat_roles-ansible_github.com.version'