From d2dfb8cdbd56e095bac09bac3f8eea87361287d9 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 30 Oct 2018 19:16:06 +0000 Subject: [PATCH] Remove unnecessary package install duplication Currently the devel packages are installed everywhere, but they only need to be where the wheels are built. Also, there is already a task to install the packages needed on the target hosts when installing - so we do not need to give the same list to the venv install role because they will already have been installed. Change-Id: I59394c17c8a5475cc41b583268e45df1da561e7d --- tasks/aodh_install_source.yml | 1 - vars/source_install.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/aodh_install_source.yml b/tasks/aodh_install_source.yml index c410ec0..7ef5671 100644 --- a/tasks/aodh_install_source.yml +++ b/tasks/aodh_install_source.yml @@ -41,7 +41,6 @@ vars: venv_build_distro_package_list: "{{ aodh_devel_distro_packages }}" venv_install_destination_path: "{{ aodh_bin | dirname }}" - venv_install_distro_package_list: "{{ aodh_distro_packages }}" venv_pip_install_args: "{{ aodh_pip_install_args }}" venv_pip_packages: "{{ (aodh_oslomsg_amqp1_enabled | bool) | ternary(aodh_pip_packages + aodh_optional_oslomsg_amqp1_pip_packages, aodh_pip_packages) }}" venv_facts_when_changed: diff --git a/vars/source_install.yml b/vars/source_install.yml index 18d8f48..e85eb8e 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -14,7 +14,7 @@ # limitations under the License. aodh_package_list: |- - {% set packages = (aodh_distro_packages + aodh_devel_distro_packages) %} + {% set packages = (aodh_distro_packages) %} {% if aodh_oslomsg_amqp1_enabled | bool %} {% set _ = packages.extend(aodh_oslomsg_amqp1_distro_packages) %} {% endif %}