From fd9edc3cb36bd9479a3c897c88a29de155a6731d Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sat, 13 Mar 2021 01:36:00 +0800 Subject: [PATCH 1/2] git submodule update --remote --- .ansible-lint | 3 --- .../alvistack/docker-mariadb | 1 + CHANGELOG.md | 5 ++++- playbooks/converge.yml | 18 ++++++++++++------ 4 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 .ansible-lint create mode 120000 .cache/collections/ansible_collections/alvistack/docker-mariadb diff --git a/.ansible-lint b/.ansible-lint deleted file mode 100644 index 5d830af..0000000 --- a/.ansible-lint +++ /dev/null @@ -1,3 +0,0 @@ -skip_list: - - no-handler # Tasks that run when changed should likely be handlers - - unnamed-task # All tasks should be named diff --git a/.cache/collections/ansible_collections/alvistack/docker-mariadb b/.cache/collections/ansible_collections/alvistack/docker-mariadb new file mode 120000 index 0000000..c866b86 --- /dev/null +++ b/.cache/collections/ansible_collections/alvistack/docker-mariadb @@ -0,0 +1 @@ +../../../.. \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3aaa741..32c819d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,13 @@ ### Major Changes -## 20210114.1.0 - 2021-01-14 +## 20210313.1.1 - 2021-03-13 ### Major Changes + - Bugfix [ansible-lint `namespace`](https://github.com/ansible-community/ansible-lint/pull/1451) + - Bugfix [ansible-lint `no-handler`](https://github.com/ansible-community/ansible-lint/pull/1402) + - Bugfix [ansible-lint `unnamed-task`](https://github.com/ansible-community/ansible-lint/pull/1413) - Change GIT tag as per Vagrant Box naming and versioning limitation ## 10.5.7-4alvistack2 - 2020-12-09 diff --git a/playbooks/converge.yml b/playbooks/converge.yml index b3217b1..32db1b8 100644 --- a/playbooks/converge.yml +++ b/playbooks/converge.yml @@ -64,22 +64,28 @@ loop: - { dest: "/usr/local/bin/docker-entrypoint.sh", mode: "0755" } - - include_role: + - name: include role + include_role: name: python - - include_role: + - name: include role + include_role: name: locales - - include_role: + - name: include role + include_role: name: timezone - - include_role: + - name: include role + include_role: name: catatonit - - include_role: + - name: include role + include_role: name: gosu - - include_role: + - name: include role + include_role: name: mariadb - name: stop service From 62daad11e96cfb11fbfbd0271656575ba77a63d4 Mon Sep 17 00:00:00 2001 From: Wong Hoi Sing Edison Date: Sat, 13 Mar 2021 01:55:38 +0800 Subject: [PATCH 2/2] 20210313.1.1 --- .../default/group_vars/all/00-defaults.yml | 4 +-- playbooks/converge.yml | 33 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/inventory/default/group_vars/all/00-defaults.yml b/inventory/default/group_vars/all/00-defaults.yml index 3586bdc..c44c332 100644 --- a/inventory/default/group_vars/all/00-defaults.yml +++ b/inventory/default/group_vars/all/00-defaults.yml @@ -18,5 +18,5 @@ mariadb_release: "10.5" kubernetes_peer_finder_download: url: "https://storage.googleapis.com/kubernetes-release/pets/peer-finder" - dest: "{{ ansible_user_dir }}/.ansible/tmp/peer-finder-latest" - checksum: "sha1:5abfeabdd8c011ddf6b0abf33011c5866ff7eb39" + dest: "/var/cache/ansible/230e96b4e6ae962c465b86553e2b4ccbc989efc6da7b2a93520f4f97a87e8e1c/peer-finder" + checksum: "sha256:230e96b4e6ae962c465b86553e2b4ccbc989efc6da7b2a93520f4f97a87e8e1c" diff --git a/playbooks/converge.yml b/playbooks/converge.yml index 32db1b8..59bb7eb 100644 --- a/playbooks/converge.yml +++ b/playbooks/converge.yml @@ -134,23 +134,16 @@ - { dest: "/var/lib/mysql", owner: "mysql", group: "mysql" } - { dest: "/var/run/mysqld", owner: "mysql", group: "mysql", mode: "0777" } - { dest: "{{ kubernetes_peer_finder_download.dest | dirname }}" } + notify: + - download archive - - name: download archive - vars: - ansible_python_interpreter: "python3" - get_url: - url: "{{ item.url }}" - dest: "{{ item.dest }}" - checksum: "{{ item.checksum }}" - timeout: 300 - loop: - - "{{ kubernetes_peer_finder_download }}" - register: get_url_result - until: get_url_result is succeeded + - name: flush handlers + meta: flush_handlers - name: unarchive package shell: | set -euo pipefail + exec &> >(tee -a {{ kubernetes_peer_finder_download.dest }}.log) cd /usr/local/bin TMP_DIR="$(mktemp -d)" \ && cp {{ kubernetes_peer_finder_download.dest }} $TMP_DIR/peer-finder \ @@ -160,7 +153,7 @@ && rm -rf $TMP_DIR args: executable: "/bin/bash" - when: get_url_result is changed + creates: "{{ kubernetes_peer_finder_download.dest }}.log" - name: copy templates template: @@ -184,3 +177,17 @@ - { dest: "/etc/mysql/my.cnf" } - { dest: "/usr/local/bin/on-start.sh", mode: "0755" } - { dest: "/usr/local/bin/peer-finder", mode: "0755" } + + handlers: + - name: download archive + vars: + ansible_python_interpreter: "python3" + get_url: + url: "{{ item.url }}" + dest: "{{ item.dest }}" + checksum: "{{ item.checksum }}" + timeout: 300 + loop: + - "{{ kubernetes_peer_finder_download }}" + register: result + until: result is succeeded