Merge branch 'release/4.7.0'

alvistack · Mar 12, 2021 · 5676f2e · 5676f2e
2 parents 6688cf3 + e04e6f5
commit 5676f2e
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
 # Ansible Role for conmon
 
-## 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.
 
 # conmon version.
-conmon_version: "v2.0.26"
+conmon_version: "v2.0.27"
 
 # conmon download details.
 conmon_download: "{{ _conmon_download[conmon_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: conmon | 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:
+    - "{{ conmon_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: conmon
   author: "Wong Hoi Sing Edison <[email protected]>"
   description: Ansible Role for conmon 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: conmon
       tags: conmon
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -55,22 +55,11 @@
   loop:
     - { dest: "/usr/local/bin" }
     - { dest: "{{ conmon_download.dest | dirname }}" }
-  register: file_result
+  notify:
+    - conmon | 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:
-    - "{{ conmon_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.
 
 _conmon_download:
+  "v2.0.27":
+    url: "http://github.com/alvistack/containers-conmon/releases/download/v2.0.27/conmon-v2.0.27-linux-amd64"
+    dest: "/var/cache/ansible/3d741c6539f2f4d28d6bf34420771ce5ce8609770ac1e102c806b1a9244b879b/conmon-v2.0.27-linux-amd64"
+    checksum: "sha256:3d741c6539f2f4d28d6bf34420771ce5ce8609770ac1e102c806b1a9244b879b"
   "v2.0.26":
     url: "http://github.com/alvistack/containers-conmon/releases/download/v2.0.26/conmon-v2.0.26-linux-amd64"
     dest: "/var/cache/ansible/891ddbdddd8a7c8178cab71c0f7fbd91f5baeee2cd5699317a2c2b724ec6bd5f/conmon-v2.0.26-linux-amd64"
@@ -23,7 +27,3 @@ _conmon_download:
     url: "http://github.com/alvistack/containers-conmon/releases/download/v2.0.25/conmon-v2.0.25-linux-amd64"
     dest: "/var/cache/ansible/0329b05a3401abe95677646f5a039fcb6790ed55a90d48a9af3e08b45b9ea3c3/conmon-v2.0.25-linux-amd64"
     checksum: "sha256:0329b05a3401abe95677646f5a039fcb6790ed55a90d48a9af3e08b45b9ea3c3"
-  "v2.0.24":
-    url: "http://github.com/alvistack/containers-conmon/releases/download/v2.0.24/conmon-v2.0.24-linux-amd64"
-    dest: "/var/cache/ansible/f0f71d1e5b2dc552ea33db21ba5ab58cd17e5010f8999658692308ef6073d861/conmon-v2.0.24-linux-amd64"
-    checksum: "sha256:f0f71d1e5b2dc552ea33db21ba5ab58cd17e5010f8999658692308ef6073d861"