From 65c4d7ca432ec36915295a6c7167800a8acda5b0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 5 May 2022 17:06:33 +0200 Subject: [PATCH] Install rally only when rally_install is set Currently we install rally regardless of user will. It is default behaviour which is not possible to override. So we add rally_install variable which defaults to false to control whether to proceed with rally installation or not. Change-Id: I325dee6ec071b6675bcfdadaf884ce8c26cf1ae9 --- playbooks/os-rally-install.yml | 4 ++++ .../roles/bootstrap-host/templates/user_variables.aio.yml.j2 | 1 + 2 files changed, 5 insertions(+) diff --git a/playbooks/os-rally-install.yml b/playbooks/os-rally-install.yml index bef4e247ae..4cb3bcb9ce 100644 --- a/playbooks/os-rally-install.yml +++ b/playbooks/os-rally-install.yml @@ -30,6 +30,10 @@ tags: - rally pre_tasks: + - name: End playbook + meta: end_play + when: + - (not (rally_install | default(false)) | bool) - include_tasks: common-tasks/unbound-clients.yml when: - hostvars['localhost']['resolvconf_enabled'] | bool diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index 1a7248d557..75fcb59045 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -243,6 +243,7 @@ lxc_container_bind_mounts: ## Always setup tempest, the resources for it, then execute tests tempest_install: yes tempest_run: yes +rally_install: yes # Do a gateway ping test once the tempest role creates it tempest_network_ping_gateway: yes