diff --git a/defaults/main.yml b/defaults/main.yml index 5ccb0d14..68b1842c 100644 --- a/defaults/main.yml +++ b/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: {} diff --git a/tasks/cinder_install_source.yml b/tasks/cinder_install_source.yml index ea2858aa..444b98f5 100644 --- a/tasks/cinder_install_source.yml +++ b/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" diff --git a/vars/distro_install.yml b/vars/distro_install.yml index ed7aa799..23198238 100644 --- a/vars/distro_install.yml +++ b/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" diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index b7b3a5b4..5b448b23 100644 --- a/vars/redhat-7.yml +++ b/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' diff --git a/vars/source_install.yml b/vars/source_install.yml index d3c414f0..8f670c73 100644 --- a/vars/source_install.yml +++ b/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" diff --git a/vars/suse.yml b/vars/suse.yml index 87a7f1f7..b2a796e2 100644 --- a/vars/suse.yml +++ b/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' diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index f7b15b32..2b5c9514 100644 --- a/vars/ubuntu.yml +++ b/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'