From 69d744dc805a78bca121075ee8c503222bc83030 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 12 May 2020 22:58:00 +0300 Subject: [PATCH] Cleanup after repo_build and pip_install retirement Change-Id: I1f2dd31d326692ec410c56971e087ed5376f563b --- defaults/main.yml | 7 ------- tasks/main.yml | 4 ++-- tests/ansible-role-requirements.yml | 4 ---- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 2c591a6..2884eed 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -50,11 +50,4 @@ rally_git_constraints: rally_pip_packages: - rally-openstack -# The inventory group where Rally will be installed. -# This variable is used by the repo_build process to determine -# which host group to check for members of before building the -# pip packages required by this role. The value is picked up -# by the py_pkgs lookup. -rally_role_project_group: utility_all - rally_config_overrides: {} diff --git a/tasks/main.yml b/tasks/main.yml index b1d7a7d..c7e32b4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,7 +26,7 @@ - always - import_tasks: db_setup.yml - when: inventory_hostname == groups[rally_role_project_group][0] + when: inventory_hostname == groups['utility_all'][0] vars: _oslodb_setup_host: "{{ rally_db_setup_host }}" _oslodb_databases: @@ -64,6 +64,6 @@ - rally-config - include_tasks: rally_db_setup.yml - when: inventory_hostname == groups[rally_role_project_group][0] + when: inventory_hostname == groups['utility_all'][0] tags: - rally-config diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 9541a75..8c00d60 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -3,10 +3,6 @@ src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning scm: git version: master -- name: pip_install - src: https://opendev.org/openstack/openstack-ansible-pip_install - scm: git - version: master - name: openstack_hosts src: https://opendev.org/openstack/openstack-ansible-openstack_hosts scm: git