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.

All -dev/-devel packages are moved into the devel
variable so that they are only installed for source
builds.

The distro install should not need the devel packages
at all, so the list extension is removed.

Finally, we remove the unnecessary installation of the
compiling packages because the python venv build role
already does it.

Depends-On: https://review.openstack.org/613585
Change-Id: I1d8c556c9f71cef9e84f097957682fc7b847f37c
This commit is contained in:
Jesse Pretorius 2018-10-30 19:11:44 +00:00 committed by Jesse Pretorius (odyssey4me)
parent 86a5ddc49c
commit 4f6dc1b520
6 changed files with 12 additions and 21 deletions

View File

@ -41,7 +41,6 @@
vars:
venv_build_distro_package_list: "{{ cinder_devel_distro_packages }}"
venv_install_destination_path: "{{ cinder_bin | dirname }}"
venv_install_distro_package_list: "{{ cinder_distro_packages }}"
venv_pip_install_args: "{{ cinder_pip_install_args }}"
venv_pip_packages: >-
{{ cinder_pip_packages +

View File

@ -26,9 +26,6 @@ cinder_package_list: |-
{% set _ = packages.extend(cinder_lvm_volume_distro_packages) %}
{% endif %}
{% endif %}
{% if cinder_developer_mode | bool %}
{% set _ = packages.extend(cinder_devel_distro_packages) %}
{% endif %}
{% if cinder_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
{% endif %}

View File

@ -20,9 +20,6 @@ tgt_service_name: tgtd
cinder_distro_packages:
- nfs-utils
- rpcbind
- libxslt-devel
- postgresql-devel
- kmod-devel
- kmod-libs
- zlib-devel
- which
@ -38,6 +35,9 @@ cinder_service_distro_packages:
cinder_devel_distro_packages:
- git
- libxslt-devel
- kmod-devel
- postgresql-devel
- systemd-devel
cinder_volume_distro_packages:

View File

@ -26,9 +26,6 @@ cinder_package_list: |-
{% set _ = packages.extend(cinder_lvm_volume_distro_packages) %}
{% endif %}
{% endif %}
{% if cinder_developer_mode | bool %}
{% set _ = packages.extend(cinder_devel_distro_packages) %}
{% endif %}
{% if cinder_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
{% endif %}

View File

@ -21,11 +21,7 @@ tgt_service_name: tgtd
cinder_distro_packages:
- nfs-utils
- rpcbind
- libxslt-devel
- postgresql-devel
- libkmod-devel
- libkmod2
- zlib-devel
- which
- open-iscsi
@ -44,8 +40,11 @@ cinder_service_distro_packages:
cinder_devel_distro_packages:
- git-core
- pkg-config
- libxslt-devel
- libkmod-devel
- postgresql-devel
- systemd-devel
- zlib-devel
cinder_volume_distro_packages:
- qemu-tools

View File

@ -22,12 +22,7 @@ tgt_service_name: tgt
# Common apt packages
cinder_distro_packages:
- libffi-dev
- libkmod-dev
- libkmod2
- libpq-dev
- libssl-dev
- libxslt1-dev
- nfs-common
- open-iscsi
- rpcbind
@ -48,8 +43,12 @@ cinder_service_distro_packages:
- uwsgi-plugin-python
cinder_devel_distro_packages:
- build-essential
- git-core
- libffi-dev
- libkmod-dev
- libpq-dev
- libssl-dev
- libxslt1-dev
- libsystemd-dev
cinder_volume_distro_packages: