Merge "Remove unnecessary package install duplication"
This commit is contained in:
commit
32dc5ea488
|
@ -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 +
|
||||
|
|
|
@ -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 %}
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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 %}
|
||||
|
|
|
@ -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
|
||||
- libpython2_7-1_0
|
||||
|
@ -45,8 +41,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
|
||||
|
|
|
@ -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
|
||||
|
@ -49,8 +44,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:
|
||||
|
|
Loading…
Reference in New Issue