openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "Install network storage related packages only on volume and backup containers"

This commit is contained in:
Zuul 2018-11-10 11:16:15 +00:00 committed by Gerrit Code Review
parent 0e512e3089 bb8af3a75b
commit 06ef040fde
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vars/distro_install.yml
View File

@ -26,6 +26,9 @@ cinder_package_list: |-
{% set _ = packages.extend(cinder_lvm_volume_distro_packages) %} {% set _ = packages.extend(cinder_lvm_volume_distro_packages) %}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if cinder_services['cinder-backup']['group'] in group_names %}
{% set _ = packages.extend(cinder_backup_distro_packages) %}
{% endif %}
{% if cinder_oslomsg_amqp1_enabled | bool %} {% if cinder_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %} {% set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
{% endif %} {% endif %}

10
vars/redhat-7.yml
View File

@ -21,8 +21,6 @@ cinder_distro_packages:
- iscsi-initiator-utils - iscsi-initiator-utils
- kmod-libs - kmod-libs
- libxml2 - libxml2
- nfs-utils
- rpcbind
- which - which
cinder_service_distro_packages: cinder_service_distro_packages:
@ -43,6 +41,9 @@ cinder_devel_distro_packages:
cinder_volume_distro_packages: cinder_volume_distro_packages:
- qemu-img-ev - qemu-img-ev
- iscsi-initiator-utils
- nfs-utils
- rpcbind
cinder_lvm_volume_distro_packages: cinder_lvm_volume_distro_packages:
- device-mapper-event - device-mapper-event
@ -50,6 +51,11 @@ cinder_lvm_volume_distro_packages:
- parted - parted
- targetcli - targetcli
cinder_backup_distro_packages:
- iscsi-initiator-utils
- nfs-utils
- rpcbind
cinder_oslomsg_amqp1_distro_packages: cinder_oslomsg_amqp1_distro_packages:
- cyrus-sasl-lib - cyrus-sasl-lib
- cyrus-sasl-plain - cyrus-sasl-plain

11
vars/suse.yml
View File

@ -22,9 +22,6 @@ cinder_distro_packages:
- libkmod2 - libkmod2
- libpython2_7-1_0 - libpython2_7-1_0
- libxml2 - libxml2
- nfs-utils
- open-iscsi
- rpcbind
- which - which
cinder_service_distro_packages: cinder_service_distro_packages:
@ -50,6 +47,9 @@ cinder_devel_distro_packages:
cinder_volume_distro_packages: cinder_volume_distro_packages:
- qemu-tools - qemu-tools
- open-iscsi
- nfs-utils
- rpcbind
cinder_lvm_volume_distro_packages: cinder_lvm_volume_distro_packages:
- device-mapper - device-mapper
@ -57,6 +57,11 @@ cinder_lvm_volume_distro_packages:
- parted - parted
- tgt - tgt
cinder_backup_distro_packages:
- open-iscsi
- nfs-utils
- rpcbind
cinder_oslomsg_amqp1_distro_packages: cinder_oslomsg_amqp1_distro_packages:
- cyrus-sasl - cyrus-sasl
- cyrus-sasl-plain - cyrus-sasl-plain

11
vars/ubuntu.yml
View File

@ -25,9 +25,6 @@ cinder_distro_packages:
- libkmod2 - libkmod2
- libpython2.7 - libpython2.7
- libxml2 - libxml2
- nfs-common
- open-iscsi
- rpcbind
- rsync - rsync
- zlib1g - zlib1g
- zlibc - zlibc
@ -55,6 +52,9 @@ cinder_devel_distro_packages:
cinder_volume_distro_packages: cinder_volume_distro_packages:
- qemu-utils - qemu-utils
- open-iscsi
- nfs-common
- rpcbind
cinder_lvm_volume_distro_packages: cinder_lvm_volume_distro_packages:
- dmeventd - dmeventd
@ -63,6 +63,11 @@ cinder_lvm_volume_distro_packages:
- tgt - tgt
- thin-provisioning-tools - thin-provisioning-tools
cinder_backup_distro_packages:
- open-iscsi
- nfs-common
- rpcbind
cinder_oslomsg_amqp1_distro_packages: cinder_oslomsg_amqp1_distro_packages:
- libsasl2-modules - libsasl2-modules
- sasl2-bin - sasl2-bin