Merge branch 'release/4.7.0'

alvistack · Mar 12, 2021 · babe094 · babe094
2 parents 3c03071 + dff2afe
commit babe094
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
 # Ansible Role for CRI-O
 
-## 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/handlers/main.yml b/handlers/main.yml
@@ -14,6 +14,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: cri_o | 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:
+    - "{{ cri_o_download }}"
+  register: result
+  until: result is succeeded
+
 - name: cri_o | systemctl restart systemd-modules-load.service
   service:
     name: "systemd-modules-load.service"

diff --git a/meta/main.yml b/meta/main.yml
@@ -15,6 +15,7 @@
 # limitations under the License.
 
 galaxy_info:
+  namespace: alvistack
   role_name: cri_o
   author: "Wong Hoi Sing Edison <[email protected]>"
   description: Ansible Role for CRI-O Installation

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -18,26 +18,32 @@
   remote_user: root
   become: true
   tasks:
-    - include_role:
+    - name: include role
+      include_role:
         name: cni_plugins
       tags: cni_plugins
 
-    - include_role:
+    - name: include role
+      include_role:
         name: cri_tools
       tags: cri_tools
 
-    - include_role:
+    - name: include role
+      include_role:
         name: containers_common
       tags: containers_common
 
-    - include_role:
+    - name: include role
+      include_role:
         name: crun
       tags: crun
 
-    - include_role:
+    - name: include role
+      include_role:
         name: conmon
       tags: conmon
 
-    - include_role:
+    - name: include role
+      include_role:
         name: cri_o
       tags: cri_o
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -65,22 +65,11 @@
     - { dest: "/usr/share/containers/oci/hooks.d" }
     - { dest: "/usr/share/oci-umount/oci-umount.d" }
     - { dest: "{{ cri_o_download.dest | dirname }}" }
-  register: file_result
+  notify:
+    - cri_o | 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:
-    - "{{ cri_o_download }}"
-  when: file_result is changed
-  register: result
-  until: result is succeeded
+- name: flush handlers
+  meta: flush_handlers
 
 - name: unarchive package
   shell: |