diff --git a/vars/debian.yml b/vars/debian.yml index 9940c423..124c5a4b 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -49,10 +49,12 @@ cinder_api_distro_packages: - uwsgi - uwsgi-plugin-python3 -cinder_volume_distro_packages: [] +cinder_volume_service_distro_packages: [] cinder_volume_distro_packages_tools: - qemu-utils + +cinder_volume_distro_packages: - open-iscsi - nfs-common - rpcbind @@ -64,6 +66,8 @@ cinder_lvm_volume_distro_packages: - tgt - thin-provisioning-tools +cinder_backup_service_distro_packages: [] + cinder_backup_distro_packages: - open-iscsi - nfs-common diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 43a9f143..89d3a72f 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -25,16 +25,18 @@ cinder_package_list: |- {% endif %} {% if cinder_services['cinder-volume']['group'] in group_names %} {% set _ = packages.extend(cinder_volume_distro_packages) %} + {% set _ = packages.extend(cinder_volume_service_distro_packages) %} {% if cinder_backend_lvm_inuse | bool %} {% 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) %} + {% set _ = packages.extend(cinder_backup_service_distro_packages) %} {% endif %} {% if cinder_oslomsg_amqp1_enabled | bool %} {% set _ = packages.extend(cinder_oslomsg_amqp1_distro_packages) %} {% endif %} - {{ packages }} + {{ packages | unique }} _cinder_bin: "/usr/bin" diff --git a/vars/redhat.yml b/vars/redhat.yml index 4f15beff..cfef49bb 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -41,10 +41,12 @@ cinder_api_distro_packages: - uwsgi - uwsgi-plugin-python -cinder_volume_distro_packages: [] +cinder_volume_service_distro_packages: [] cinder_volume_distro_packages_tools: - "qemu-img{% if ansible_distribution_major_version|int <= 7 %}-ev{% endif %}" + +cinder_volume_distro_packages: - iscsi-initiator-utils - nfs-utils - rpcbind @@ -55,6 +57,8 @@ cinder_lvm_volume_distro_packages: - parted - targetcli +cinder_backup_service_distro_packages: [] + cinder_backup_distro_packages: - iscsi-initiator-utils - nfs-utils diff --git a/vars/source_install.yml b/vars/source_install.yml index a63c5748..4c1ab6a5 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -26,10 +26,13 @@ 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 %} - {{ packages }} + {{ packages | unique }} _cinder_bin: "/openstack/venvs/cinder-{{ cinder_venv_tag }}/bin" cinder_uwsgi_bin: "{{ _cinder_bin }}" diff --git a/vars/suse.yml b/vars/suse.yml index 63c7cd61..33c6e09a 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -41,11 +41,13 @@ cinder_devel_distro_packages: - systemd-devel - zlib-devel -cinder_volume_distro_packages: +cinder_volume_service_distro_packages: - openstack-cinder-volume cinder_volume_distro_packages_tools: - qemu-tools + +cinder_volume_distro_packages: - open-iscsi - nfs-utils - rpcbind @@ -56,8 +58,10 @@ cinder_lvm_volume_distro_packages: - parted - tgt -cinder_backup_distro_packages: +cinder_backup_service_distro_packages: - openstack-cinder-backup + +cinder_backup_distro_packages: - open-iscsi - nfs-utils - rpcbind