openstack/tripleo-ansible
Code Issues Proposed changes

Revert "Workaround for ansible-lint installation failure"

Browse Source 
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
This commit is contained in:
Jesse Pretorius (odyssey4me)
2019-10-29 10:54:24 +00:00
parent 081d99dc53
commit 28e105c056
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

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

4
tox.ini
View File

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

11
tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml
View File

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