diff --git a/.ansible-lint b/.ansible-lint index 0c3a55d0e4..003362be5e 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -7,3 +7,6 @@ warn_list: - unnamed-task - no-handler - var-naming + +extra_vars: + openstack_service_setup_host: utility_all diff --git a/playbooks/ceph-rgw-keystone-setup.yml b/playbooks/ceph-rgw-keystone-setup.yml index c427a5ed25..696f694453 100644 --- a/playbooks/ceph-rgw-keystone-setup.yml +++ b/playbooks/ceph-rgw-keystone-setup.yml @@ -17,7 +17,7 @@ hosts: "{{ openstack_service_setup_host | default('localhost') }}" user: root vars_files: - - "defaults/{{ install_method }}_install.yml" + - "defaults/{{ install_method | default('source') }}_install.yml" vars: ansible_python_interpreter: >- {{ openstack_service_setup_host_python_interpreter | diff --git a/playbooks/healthcheck-infrastructure.yml b/playbooks/healthcheck-infrastructure.yml index 621e5d69dc..cdcaf97e19 100644 --- a/playbooks/healthcheck-infrastructure.yml +++ b/playbooks/healthcheck-infrastructure.yml @@ -101,7 +101,7 @@ hosts: "{{ openstack_service_setup_host | default('localhost') }}" gather_facts: no vars_files: - - "defaults/{{ install_method }}_install.yml" + - "defaults/{{ install_method | default('source') }}_install.yml" vars: ansible_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default(ansible_facts['python']['executable']) }}" tasks: diff --git a/playbooks/os-keystone-install.yml b/playbooks/os-keystone-install.yml index 3c56aadac0..7e0bec91cc 100644 --- a/playbooks/os-keystone-install.yml +++ b/playbooks/os-keystone-install.yml @@ -23,7 +23,7 @@ hosts: "{{ openstack_service_setup_host | default('localhost') }}" gather_facts: "{{ osa_gather_facts | default(True) }}" vars_files: - - "defaults/{{ install_method }}_install.yml" + - "defaults/{{ install_method | default('source') }}_install.yml" become: yes tags: - openrc diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 49df25ea8f..48e812b3dc 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -147,7 +147,7 @@ elif [[ "${ACTION}" == "linters" ]]; then else ROLE_DIR="${OSA_CLONE_DIR}" ${VENV_BIN_DIR}/ansible-lint playbooks/ --exclude /etc/ansible/roles - ansible-playbook --syntax-check --list-tasks playbooks/setup-everything.yml + ansible-playbook --syntax-check --list-tasks playbooks/setup-everything.yml -e openstack_service_setup_host=utility_all fi # Run bashate