From eaf29823b418ad4d55e48c22e419cf51bfc88c22 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 30 Oct 2018 19:19:08 +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: I8d13d6c59cdce3f9ff7642a6b92444b473ccec6d --- tasks/ceilometer_install_source.yml | 1 - vars/source_install.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/ceilometer_install_source.yml b/tasks/ceilometer_install_source.yml index 848ba582..3f5d6f15 100644 --- a/tasks/ceilometer_install_source.yml +++ b/tasks/ceilometer_install_source.yml @@ -42,7 +42,6 @@ vars: venv_build_distro_package_list: "{{ ceilometer_devel_distro_packages }}" venv_install_destination_path: "{{ ceilometer_bin | dirname }}" - venv_install_distro_package_list: "{{ ceilometer_distro_packages }}" venv_pip_install_args: "{{ ceilometer_pip_install_args }}" venv_pip_packages: "{{ (ceilometer_oslomsg_amqp1_enabled | bool) | ternary(ceilometer_pip_packages + ceilometer_optional_oslomsg_amqp1_pip_packages, ceilometer_pip_packages) }}" venv_facts_when_changed: diff --git a/vars/source_install.yml b/vars/source_install.yml index 857ce48f..a1766e0a 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -14,7 +14,7 @@ # limitations under the License. ceilometer_package_list: |- - {% set packages = (ceilometer_distro_packages + ceilometer_devel_distro_packages) %} + {% set packages = (ceilometer_distro_packages) %} {% if ceilometer_oslomsg_amqp1_enabled | bool %} {% set _ = packages.extend(ceilometer_oslomsg_amqp1_distro_packages) %} {% endif %}