From 0fcfbf374ca008df6df47c8f9a2c81fae4e7d809 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 30 Oct 2018 19:21:05 +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: Ifdff299a81cbba90cf819c9a628650c8b1be3d6a --- tasks/horizon_install_source.yml | 1 - vars/source_install.yml | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/horizon_install_source.yml b/tasks/horizon_install_source.yml index 189d0ddf..610f2f4c 100644 --- a/tasks/horizon_install_source.yml +++ b/tasks/horizon_install_source.yml @@ -65,7 +65,6 @@ vars: venv_build_distro_package_list: "{{ horizon_devel_distro_packages }}" venv_install_destination_path: "{{ horizon_bin | dirname }}" - venv_install_distro_package_list: "{{ horizon_distro_packages }}" venv_pip_install_args: "{{ horizon_pip_install_args }}" venv_pip_packages: >- {{ horizon_pip_packages + horizon_optional_pip_packages + diff --git a/vars/source_install.yml b/vars/source_install.yml index 524b38f8..3c10586a 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -12,7 +12,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -horizon_package_list: "{{ horizon_distro_packages + horizon_devel_distro_packages }}" + +horizon_package_list: "{{ horizon_distro_packages }}" _horizon_bin: "/openstack/venvs/horizon-{{ horizon_venv_tag }}/bin" _horizon_lib_dir: "{{ _horizon_bin | dirname }}/lib/python2.7/dist-packages" horizon_python_lib_dir: "{{ _horizon_lib_dir }}"