Setup oslo.messaging extra packages for optional drivers

Change-Id: I4f8ac2366dabddac78715da03e82080b0bb1fa73

defaults/main.yml

@@ -101,6 +101,10 @@ cinder_oslomsg_notify_userid: "{{ cinder_oslomsg_rpc_userid }}"
 cinder_oslomsg_notify_password: "{{ cinder_oslomsg_rpc_password }}"
 cinder_oslomsg_notify_vhost: "{{ cinder_oslomsg_rpc_vhost }}"
 
+## (Qdrouterd) integration
+# TODO(evrardjp): Change structure when more backends will be supported
+cinder_oslomsg_amqp1_enabled: "{{ cinder_oslomsg_rpc_transport == 'amqp' }}"
+
 ## Cinder User / Group
 cinder_system_user_name: cinder
 cinder_system_group_name: cinder
@@ -295,6 +299,9 @@ cinder_pip_packages:
   - systemd-python
   - uwsgi
 
+cinder_optional_oslomsg_amqp1_pip_packages:
+  - oslo.messaging[amqp1]
+
 cinder_api_init_overrides: {}
 cinder_scheduler_init_overrides: {}
 cinder_volume_init_overrides: {}

tasks/cinder_install_source.yml

@@ -43,7 +43,9 @@
     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 }}"
+    venv_pip_packages: >-
+      {{ cinder_pip_packages +
+         (cinder_oslomsg_amqp1_enabled | bool) | ternary(cinder_optional_oslomsg_amqp1_pip_packages, []) }}
     venv_facts_when_changed:
       - section: "cinder"
         option: "need_service_restart"

vars/distro_install.yml

@@ -29,6 +29,9 @@ cinder_package_list: |-
   {% 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 %}
   {{ packages }}
 
 _cinder_bin: "/usr/bin"

vars/redhat-7.yml

@@ -49,4 +49,9 @@ cinder_lvm_volume_distro_packages:
   - parted
   - targetcli
 
+cinder_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl-lib
+  - cyrus-sasl-plain
+  - cyrus-sasl-md5
+
 cinder_uwsgi_bin: '/usr/sbin'

vars/source_install.yml

@@ -29,6 +29,9 @@ cinder_package_list: |-
   {% 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 %}
   {{ packages }}
 
 _cinder_bin: "/openstack/venvs/cinder-{{ cinder_venv_tag }}/bin"

vars/suse.yml

@@ -56,4 +56,9 @@ cinder_lvm_volume_distro_packages:
   - parted
   - tgt
 
+cinder_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl
+  - cyrus-sasl-plain
+  - cyrus-sasl-digestmd5
+
 cinder_uwsgi_bin: '/usr/sbin'

vars/ubuntu.yml

@@ -62,4 +62,8 @@ cinder_lvm_volume_distro_packages:
   - tgt
   - thin-provisioning-tools
 
+cinder_oslomsg_amqp1_distro_packages:
+  - libsasl2-modules
+  - sasl2-bin
+
 cinder_uwsgi_bin: '/usr/bin'