diff --git a/defaults/main.yml b/defaults/main.yml index dc5dacb7..32410a36 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -143,6 +143,10 @@ nova_oslomsg_notify_userid: "{{ nova_oslomsg_rpc_userid }}" nova_oslomsg_notify_password: "{{ nova_oslomsg_rpc_password }}" nova_oslomsg_notify_vhost: "{{ nova_oslomsg_rpc_vhost }}" +## Qdrouterd info +# TODO(ansmith): Change structure when more backends will be supported +nova_oslomsg_amqp1_enabled: "{{ nova_oslomsg_rpc_transport == 'amqp' }}" + ## RabbitMQ info ## Configuration for RPC communications @@ -569,6 +573,9 @@ nova_pip_packages: - python-openstackclient - uWSGI +nova_optional_oslomsg_amqp1_pip_packages: + - oslo.messaging[amqp1] + nova_compute_lxd_pip_packages: - pylxd - nova-lxd diff --git a/tasks/nova_install_source.yml b/tasks/nova_install_source.yml index 943dee86..3913d9ba 100644 --- a/tasks/nova_install_source.yml +++ b/tasks/nova_install_source.yml @@ -46,7 +46,8 @@ venv_pip_install_args: "{{ nova_pip_install_args }}" venv_pip_packages:>- {{ nova_pip_packages + - ((nova_services['nova-novncproxy']['group'] in group_names) and (nova_console_type == 'novnc')) | ternary(nova_novnc_pip_packages, []) }} + ((nova_services['nova-novncproxy']['group'] in group_names) and (nova_console_type == 'novnc')) | ternary(nova_novnc_pip_packages, []) + + (nova_oslomsg_amqp1_enabled | bool) | ternary(nova_optional_oslomsg_amqp1_pip_packages, []) }} venv_facts_when_changed: - section: "nova" option: "need_service_restart" diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 732d578a..7a9dc071 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -48,6 +48,9 @@ nova_package_list: |- {% set _ = packages.extend(nova_compute_barbican_distro_packages) %} {% endif %} {% endif %} + {% if nova_oslomsg_amqp1_enabled | bool %} + {% set _ = packages.extend(nova_compute_oslomsg_amqp1_distro_packages) %} + {% endif %} {% set _ = packages.extend(nova_service_distro_packages) %} {{ packages }} diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index e179bdb6..32e3411e 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -93,6 +93,11 @@ nova_compute_kvm_packages_to_symlink: nova_compute_ksm_packages: - ksmtuned +nova_compute_oslomsg_amqp1_distro_packages: + - cyrus-sasl-lib + - cyrus-sasl-plain + - cyrus-sasl-md5 + # TODO: add support for LXD on CentOS at some point. nova_compute_lxd_distro_packages: [] diff --git a/vars/source_install.yml b/vars/source_install.yml index febd9e0b..6f674c63 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -42,6 +42,9 @@ nova_package_list: |- {% set _ = packages.extend(nova_compute_barbican_distro_packages) %} {% endif %} {% endif %} + {% if nova_oslomsg_amqp1_enabled | bool %} + {% set _ = packages.extend(nova_compute_oslomsg_amqp1_distro_packages) %} + {% endif %} {% set _ = packages.extend(nova_devel_distro_packages) %} {{ packages }} diff --git a/vars/suse.yml b/vars/suse.yml index 33343524..ce386227 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -103,6 +103,11 @@ nova_compute_kvm_packages_to_symlink: nova_compute_ksm_packages: - qemu-ksm +nova_compute_oslomsg_amqp1_distro_packages: + - cyrus-sasl + - cyrus-sasl-plain + - cyrus-sasl-digestmd5 + # TODO: add support for LXD on openSUSE at some point. nova_compute_lxd_distro_packages: [] diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index f3a3b496..bbc12ed6 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -71,6 +71,10 @@ nova_novnc_distro_packages: nova_compute_barbican_distro_packages: - cryptsetup +nova_compute_oslomsg_amqp1_distro_packages: + - libsasl2-modules + - sasl2-bin + # the qemu-system-.*, qemu-block-extra, qemu-utils, qemu-user packages are explictly listed # for consistent upgrades (they will all be to the same version) nova_compute_kvm_distro_packages: