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

vars/distro_install.yml

@@ -26,6 +26,9 @@ cinder_package_list: |-
   {%     set _ = packages.extend(cinder_lvm_volume_distro_packages) %}
   {%   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 %}
   {%   set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %}
   {% endif %}

vars/redhat-7.yml

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

vars/suse.yml

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

vars/ubuntu.yml

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