Merge branch 'release/4.7.0'

alvistack · Mar 12, 2021 · 98cbc30 · 98cbc30
2 parents a9a0db4 + d74584e
commit 98cbc30
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
 # Ansible Role for rclone
 
-## 4.7.0 - TBC
+## 4.8.0 - TBC
 
 ### Major Changes
 
+## 4.7.0 - 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)
   - Simplify Python dependency with system packages
   - Support RHEL 8 with Molecule
   - Support RHEL 7 with Molecule

diff --git a/ansible-galaxy-requirements.yml b/ansible-galaxy-requirements.yml
@@ -17,7 +17,7 @@
 collections:
   - name: community.general
     src: https://galaxy.ansible.com
-    version: ">=1.0.0,<2.0.0"
+    version: ">=2.0.0,<3.0.0"
 
   - name: community.kubernetes
     src: https://galaxy.ansible.com

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # rclone version.
-rclone_version: "v1.54.0"
+rclone_version: "v1.54.1"
 
 # rclone download details.
 rclone_download: "{{ _rclone_download[rclone_version] }}"
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -13,3 +13,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+- name: rclone | download archive
+  vars:
+    ansible_python_interpreter: "python3"
+  get_url:
+    url: "{{ item.url }}"
+    dest: "{{ item.dest }}"
+    checksum: "{{ item.checksum }}"
+    mode: "{{ item.mode | default('0644') }}"
+    timeout: 300
+  loop:
+    - "{{ rclone_download }}"
+  register: result
+  until: result is succeeded
diff --git a/meta/main.yml b/meta/main.yml
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 galaxy_info:
+  namespace: alvistack
   role_name: rclone
   author: "Wong Hoi Sing Edison <hswong3i@pantarei-design.com>"
   description: Ansible Role for rclone Installation

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -18,6 +18,7 @@
   remote_user: root
   become: true
   tasks:
-    - include_role:
+    - name: include role
+      include_role:
         name: rclone
       tags: rclone
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -56,22 +56,11 @@
     - { dest: "/etc/bash_completion.d" }
     - { dest: "/usr/local/bin" }
     - { dest: "{{ rclone_download.dest | dirname }}" }
-  register: file_result
+  notify:
+    - rclone | download archive
 
-- name: download archive
-  vars:
-    ansible_python_interpreter: "python3"
-  get_url:
-    url: "{{ item.url }}"
-    dest: "{{ item.dest }}"
-    checksum: "{{ item.checksum }}"
-    mode: "{{ item.mode | default('0644') }}"
-    timeout: 300
-  loop:
-    - "{{ rclone_download }}"
-  when: file_result is changed
-  register: result
-  until: result is succeeded
+- name: flush handlers
+  meta: flush_handlers
 
 - name: unarchive package
   shell: |

diff --git a/vars/main.yml b/vars/main.yml
@@ -15,6 +15,10 @@
 # limitations under the License.
 
 _rclone_download:
+  "v1.54.1":
+    url: "http://github.com/ncw/rclone/releases/download/v1.54.1/rclone-v1.54.1-linux-amd64.zip"
+    dest: "/var/cache/ansible/c52cbf3646a2d15765b87cf05fc3b2bca3b1d2782d4922046c597bd979e42720/rclone-v1.54.1-linux-amd64.zip"
+    checksum: "sha256:c52cbf3646a2d15765b87cf05fc3b2bca3b1d2782d4922046c597bd979e42720"
   "v1.54.0":
     url: "http://github.com/ncw/rclone/releases/download/v1.54.0/rclone-v1.54.0-linux-amd64.zip"
     dest: "/var/cache/ansible/bee31ef4c9cfb1f2bcc3b662c3102cfbe6a551918d2deac6101459557a3fe0b4/rclone-v1.54.0-linux-amd64.zip"