Configure ansible-lint and fix issues found
Copy ansible-lint configuration from kolla-ansible as a starting point. Also replace alint tox job by ansible-lint. Fix various issues found by ansible-lint to make it pass with the current set of rules. Change-Id: I1d6173caadbcf249330512e170af8095464f1237
This commit is contained in:
44
.ansible-lint
Normal file
44
.ansible-lint
Normal file
@@ -0,0 +1,44 @@
|
||||
---
|
||||
# NOTE(priteau): Rule file imported from kolla-ansible
|
||||
strict: true
|
||||
use_default_rules: true
|
||||
skip_list:
|
||||
# [E301] Commands should not change things if nothing needs doing
|
||||
# TODO(mnasiadka): Fix tasks that fail this check in a later iteration
|
||||
- no-changed-when
|
||||
# [E503] Tasks that run when changed should likely be handlers
|
||||
- no-handler
|
||||
# [unnamed-task] All tasks should be named
|
||||
# FIXME(mgoddard): Add names to all tasks
|
||||
- unnamed-task
|
||||
# disable experimental rules
|
||||
- experimental
|
||||
# Package installs should not use latest
|
||||
- package-latest
|
||||
# Most files should not contain tabs
|
||||
- no-tabs
|
||||
# NOTE(frickler): Agreed at Zed PTG not to use FQCN for builtin actions for now, due to
|
||||
# conflicts with open patches and backports.
|
||||
- fqcn-builtins
|
||||
# Allow Jinja templating inside task and play names
|
||||
- name[template]
|
||||
# FQCNs again, now for module actions
|
||||
- fqcn[action]
|
||||
# role name check matching ^*$
|
||||
- role-name
|
||||
# Allow long lines
|
||||
- yaml[line-length]
|
||||
# TODO(frickler): Discuss these in detail, skipping for now to unblock things
|
||||
- command-instead-of-module
|
||||
- command-instead-of-shell
|
||||
- deprecated-local-action
|
||||
- ignore-errors
|
||||
- jinja[spacing]
|
||||
- key-order[task]
|
||||
- name[play]
|
||||
- no-free-form
|
||||
- risky-file-permissions
|
||||
- risky-shell-pipe
|
||||
- run-once[task]
|
||||
- var-naming[no-reserved]
|
||||
- var-naming[no-role-prefix]
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -58,6 +58,7 @@ ansible/*.retry
|
||||
ansible/roles/*/tests/*.retry
|
||||
|
||||
# Ansible Galaxy roles & collections
|
||||
.ansible
|
||||
ansible/roles/*\.*/
|
||||
ansible/collections/
|
||||
|
||||
|
@@ -11,7 +11,7 @@
|
||||
tags:
|
||||
- apt
|
||||
tasks:
|
||||
- name: include apt role
|
||||
- name: Include apt role
|
||||
include_role:
|
||||
name: apt
|
||||
when: ansible_facts.os_family == 'Debian'
|
||||
|
@@ -15,7 +15,7 @@
|
||||
tasks:
|
||||
- name: Set a fact about the kayobe target virtualenv
|
||||
set_fact:
|
||||
virtualenv: "{{ ansible_python_interpreter | dirname | dirname }}"
|
||||
kayobe_virtualenv: "{{ ansible_python_interpreter | dirname | dirname }}"
|
||||
when:
|
||||
- ansible_python_interpreter is defined
|
||||
- not ansible_python_interpreter.startswith('/bin')
|
||||
@@ -47,12 +47,12 @@
|
||||
mode: 0755
|
||||
# Check whether the virtualenv directory is a subdirectory of the
|
||||
# global virtualenv directory.
|
||||
when: virtualenv.startswith(virtualenv_path)
|
||||
when: kayobe_virtualenv.startswith(virtualenv_path)
|
||||
become: True
|
||||
|
||||
- name: Ensure kayobe virtualenv directory exists
|
||||
file:
|
||||
path: "{{ virtualenv }}"
|
||||
path: "{{ kayobe_virtualenv }}"
|
||||
state: directory
|
||||
owner: "{{ ansible_facts.user_uid }}"
|
||||
group: "{{ ansible_facts.user_gid }}"
|
||||
@@ -69,7 +69,7 @@
|
||||
pip:
|
||||
name: pip
|
||||
state: latest
|
||||
virtualenv: "{{ virtualenv }}"
|
||||
virtualenv: "{{ kayobe_virtualenv }}"
|
||||
# Site packages are required for using the dnf module, which is not
|
||||
# available via PyPI.
|
||||
virtualenv_site_packages: True
|
||||
@@ -79,14 +79,14 @@
|
||||
pip:
|
||||
name: selinux
|
||||
state: latest
|
||||
virtualenv: "{{ virtualenv }}"
|
||||
virtualenv: "{{ kayobe_virtualenv }}"
|
||||
when:
|
||||
- ansible_facts.os_family == 'RedHat'
|
||||
vars:
|
||||
# Use the system python interpreter since the virtualenv might not
|
||||
# exist.
|
||||
ansible_python_interpreter: "{{ ansible_facts.python.executable }}"
|
||||
when: virtualenv is defined
|
||||
when: kayobe_virtualenv is defined
|
||||
|
||||
# If we gathered facts earlier it would have been with a different Python
|
||||
# interpreter. For gathering modes that may use a fact cache, gather facts
|
||||
@@ -96,7 +96,7 @@
|
||||
filter: "{{ kayobe_ansible_setup_filter }}"
|
||||
gather_subset: "{{ kayobe_ansible_setup_gather_subset }}"
|
||||
when:
|
||||
- virtualenv is defined
|
||||
- kayobe_virtualenv is defined
|
||||
- gather_facts is not skipped
|
||||
- lookup('config', 'DEFAULT_GATHERING') != 'implicit'
|
||||
|
||||
@@ -110,15 +110,15 @@
|
||||
name: "{{ packages | select | list }}"
|
||||
state: present
|
||||
become: True
|
||||
when: virtualenv is not defined
|
||||
when: kayobe_virtualenv is not defined
|
||||
|
||||
- name: Ensure kolla-ansible virtualenv has docker SDK for python installed
|
||||
pip:
|
||||
name: docker
|
||||
state: latest
|
||||
virtualenv: "{{ virtualenv | default(omit) }}"
|
||||
virtualenv: "{{ kayobe_virtualenv | default(omit) }}"
|
||||
extra_args: "{% if docker_upper_constraints_file %}-c {{ docker_upper_constraints_file }}{% endif %}"
|
||||
become: "{{ virtualenv is not defined }}"
|
||||
become: "{{ kayobe_virtualenv is not defined }}"
|
||||
vars:
|
||||
docker_upper_constraints_file: "{{ pip_upper_constraints_file }}"
|
||||
when:
|
||||
@@ -129,7 +129,7 @@
|
||||
import_role:
|
||||
name: openstack.kolla.podman_sdk
|
||||
vars:
|
||||
virtualenv: "{{ virtualenv }}"
|
||||
virtualenv: "{{ kayobe_virtualenv }}"
|
||||
podman_sdk_upper_constraints_file: "{{ pip_upper_constraints_file }}"
|
||||
when:
|
||||
- "'container-engine' in group_names"
|
||||
|
@@ -57,7 +57,7 @@
|
||||
virtualenv: "{{ kolla_ansible_target_venv }}"
|
||||
extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
|
||||
become: True
|
||||
when: "{{ container_engine == 'docker' }}"
|
||||
when: container_engine == 'docker'
|
||||
|
||||
- name: Ensure kolla-ansible virtualenv has podman SDK installed
|
||||
pip:
|
||||
@@ -66,7 +66,7 @@
|
||||
virtualenv: "{{ kolla_ansible_target_venv }}"
|
||||
extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
|
||||
become: True
|
||||
when: "{{ container_engine == 'podman' }}"
|
||||
when: container_engine == 'podman'
|
||||
|
||||
- name: Ensure kolla-ansible virtualenv has SELinux bindings installed
|
||||
pip:
|
||||
|
@@ -9,7 +9,7 @@
|
||||
tags:
|
||||
- mdadm
|
||||
roles:
|
||||
- name: mrlesmithjr.mdadm
|
||||
- role: mrlesmithjr.mdadm
|
||||
become: True
|
||||
when:
|
||||
- mdadm_arrays is defined
|
||||
|
@@ -1,3 +1,4 @@
|
||||
---
|
||||
- name: Configure HTTP(S) proxy settings
|
||||
hosts: seed-hypervisor:seed:overcloud:infra-vms
|
||||
max_fail_percentage: >-
|
||||
|
@@ -1,5 +1,5 @@
|
||||
---
|
||||
- name: reload systemd daemon
|
||||
- name: Reload systemd daemon
|
||||
systemd:
|
||||
name: cloud-init
|
||||
daemon_reload: yes
|
||||
|
@@ -5,5 +5,5 @@
|
||||
state: touch
|
||||
mode: "u=rw,g=r,o=r"
|
||||
notify:
|
||||
- reload systemd daemon
|
||||
- Reload systemd daemon
|
||||
become: True
|
||||
|
@@ -1,7 +1,7 @@
|
||||
---
|
||||
- import_tasks: prerequisites.yml
|
||||
|
||||
- name: list all VMs on hypervisor
|
||||
- name: List all VMs on hypervisor
|
||||
virt:
|
||||
command: list_vms
|
||||
register: all_vms
|
||||
|
@@ -159,4 +159,4 @@
|
||||
# newer versions.
|
||||
ANSIBLE_COLLECTIONS_SCAN_SYS_PATH: "False"
|
||||
# NOTE(wszumski): Don't use path configured for kayobe
|
||||
ANSIBLE_COLLECTIONS_PATH:
|
||||
ANSIBLE_COLLECTIONS_PATH: ''
|
||||
|
@@ -176,7 +176,6 @@ neutron_tenant_network_types: {{ kolla_neutron_ml2_tenant_network_types | join('
|
||||
# ulimits:
|
||||
|
||||
|
||||
|
||||
#############
|
||||
# TLS options
|
||||
#############
|
||||
|
@@ -1,3 +1,4 @@
|
||||
---
|
||||
- name: Destroy containers (loop)
|
||||
include_tasks: destroy-container.yml
|
||||
vars:
|
||||
|
@@ -11,4 +11,3 @@
|
||||
- ssh-known-host
|
||||
roles:
|
||||
- role: ssh-known-host
|
||||
|
||||
|
@@ -9,7 +9,7 @@
|
||||
tags:
|
||||
- tuned
|
||||
roles:
|
||||
- name: giovtorres.tuned
|
||||
- role: giovtorres.tuned
|
||||
become: true
|
||||
when:
|
||||
- tuned_active_builtin_profile != ""
|
||||
|
@@ -1,2 +1,3 @@
|
||||
---
|
||||
aio_ips:
|
||||
controller1: 192.168.33.3
|
||||
|
@@ -75,10 +75,10 @@ Environments
|
||||
|
||||
The following tox environments are provided:
|
||||
|
||||
alint
|
||||
Run Ansible linter.
|
||||
ansible
|
||||
Run Ansible tests for some ansible roles using Ansible playbooks.
|
||||
ansible-lint
|
||||
Run Ansible linter.
|
||||
ansible-syntax
|
||||
Run a syntax check for all Ansible files.
|
||||
docs
|
||||
|
24
tox.ini
24
tox.ini
@@ -69,8 +69,28 @@ commands =
|
||||
-p {toxinidir}/ansible/roles
|
||||
bash -c "source {envdir}/bin/activate && {toxinidir}/tools/test-molecule.sh {posargs}"
|
||||
|
||||
[testenv:alint]
|
||||
commands = bash -c "ansible-lint {toxinidir}/ansible/*.yml"
|
||||
[testenv:linters]
|
||||
# Env vars and deps need to be defined in top level tox env
|
||||
setenv =
|
||||
ANSIBLE_ACTION_PLUGINS = {toxinidir}/ansible/action_plugins
|
||||
ANSIBLE_FILTER_PLUGINS = {toxinidir}/ansible/filter_plugins
|
||||
ANSIBLE_ROLES_PATH = {toxinidir}/ansible/roles
|
||||
|
||||
deps =
|
||||
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands =
|
||||
{[testenv:ansible-lint]commands}
|
||||
|
||||
[testenv:ansible-lint]
|
||||
# Lint only code in ansible/* - ignore various folders used by CI
|
||||
# TODO(priteau): Ignore YAML linting issues in plugins and figure out why
|
||||
# idrac-bootstrap.yml fails.
|
||||
setenv = {[testenv:linters]setenv}
|
||||
deps = {[testenv:linters]deps}
|
||||
commands =
|
||||
ansible-lint -p --exclude etc --exclude kayobe/plugins --exclude playbooks --exclude releasenotes --exclude roles --exclude zuul.d --exclude ansible/idrac-bootstrap.yml
|
||||
|
||||
[testenv:ansible-syntax]
|
||||
commands =
|
||||
|
Reference in New Issue
Block a user