From 5064a6d10f9123700c6b4438af26565d38a16d14 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 17 Aug 2023 14:29:25 +0200 Subject: [PATCH] Define install_method default when hosts resolution depend on it In some playbooks we try to fetch openstack_service_setup_host based on install_method variable. However, if variable is not defined, and it is not by default, playbooks will run against localhost, which will result in failure. Closes-Bug: #2031647 Change-Id: I247ce2a808076ff55347db54327a1e4913ea3006 (cherry picked from commit f05c90103cdc3e18ae8b100fb4f260d2809168d9) --- .ansible-lint | 3 +++ playbooks/ceph-rgw-keystone-setup.yml | 2 +- playbooks/healthcheck-infrastructure.yml | 2 +- playbooks/os-keystone-install.yml | 2 +- scripts/gate-check-commit.sh | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) 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 9ee706c446..325d9204ae 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 13a2ae179a..5eb6816da6 100644 --- a/playbooks/healthcheck-infrastructure.yml +++ b/playbooks/healthcheck-infrastructure.yml @@ -99,7 +99,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 8555fc09be..157f644210 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 c28a0f132b..1c850c5e72 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -146,7 +146,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