Revert "Workaround for ansible-lint installation failure"

This reverts the disabling of the ansible-lint test from
commit cffd4fc9d4 and updates
ansible-lint to the fixed version.

Included are fixes for ansible-lint test failures which
got merged as part of I2f88caa8e1c230dfe846a8a0dd9f939b98992cd5
while the lint test was disabled.

Change-Id: I37100f5e1764a5cd2cb8df82ae963e673ca0a8da

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
         types: [file, yaml]
         entry: yamllint --strict -f parsable
   - repo: https://github.com/ansible/ansible-lint
-    rev: v4.1.0a0
+    rev: v4.1.1a2
     hooks:
       - id: ansible-lint
         files: \.(yaml|yml)$

tox.ini

@@ -82,9 +82,7 @@ deps =
     -r {toxinidir}/molecule-requirements.txt
 commands =
     {[testenv:pep8]commands}
-    #TODO(ekultails): Re-enable after this is fixed
-    # https://github.com/ansible/ansible-lint/issues/590
-    #{[testenv:ansible-lint]commands}
+    {[testenv:ansible-lint]commands}
     {[testenv:bashate]commands}
     {[testenv:yamllint]commands}
     {[testenv:whitespace]commands}

tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml

@@ -53,15 +53,18 @@
         src: "{{ item.path }}"
       register: containers_data
       loop: "{{ hashed_files.files }}"
-    - set_fact:
-        container_hash: "{'{{ item.source|basename|regex_replace('^hashed-','')|regex_replace('.json$','')}}': {{item.content|b64decode|from_json}} }"
+    - name: Prepare container hashes from config
+      set_fact:
+        container_hash: "{'{{ item.source|basename|regex_replace('^hashed-','')|regex_replace('.json$','') }}': {{ item.content|b64decode|from_json }} }"
       register: container_hashes
       loop: "{{ containers_data['results'] }}"
-    - set_fact:
+    - name: Compile container hashes from results
+      set_fact:
         container_hash: "{{ item.ansible_facts.container_hash | combine(item.ansible_facts.container_hash) }}"
       register: container_hashes
       loop: "{{ container_hashes.results }}"
-    - set_fact:
+    - name: Finalise hashes for all containers
+      set_fact:
         all_containers_hash: "{{ container_hashes.results | map(attribute='ansible_facts.container_hash') | list | singledict() }}"
 
 - name: Manage containers with Podman