From 667d22f30969a62f5395753b8f62d03dc585a654 Mon Sep 17 00:00:00 2001
From: Andy Smith <ansmith@redhat.com>
Date: Mon, 16 Jul 2018 14:53:46 -0400
Subject: [PATCH] Setup oslo.messaging extra packages for optional drivers

Change-Id: I2da4d7fd7703993de67aae0dea6c26eeea384787
---
 defaults/main.yml                | 5 +++++
 tasks/neutron_install_source.yml | 3 ++-
 vars/distro_install.yml          | 3 +++
 vars/main.yml                    | 3 +++
 vars/redhat-7.yml                | 5 +++++
 vars/source_install.yml          | 3 +++
 vars/suse-42.yml                 | 5 +++++
 vars/ubuntu.yml                  | 4 ++++
 8 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 2af2a8f6..cb2f0c15 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -260,6 +260,11 @@ neutron_oslomsg_notify_userid: "{{ neutron_oslomsg_rpc_userid }}"
 neutron_oslomsg_notify_password: "{{ neutron_oslomsg_rpc_password }}"
 neutron_oslomsg_notify_vhost: "{{ neutron_oslomsg_rpc_vhost }}"
 
+###
+### (Qdrouterd) integration
+###
+# TODO(evrardjp): Change structure when more backends will be supported
+neutron_oslomsg_amqp1_enabled: "{{ neutron_oslomsg_rpc_transport == 'amqp' }}"
 
 ###
 ### (RabbitMQ) integration
diff --git a/tasks/neutron_install_source.yml b/tasks/neutron_install_source.yml
index 5b24b0d1..1470e731 100644
--- a/tasks/neutron_install_source.yml
+++ b/tasks/neutron_install_source.yml
@@ -48,7 +48,8 @@
          (neutron_fwaas | bool) | ternary(neutron_optional_fwaas_pip_packages, []) +
          (neutron_fwaas_v2 | bool) | ternary(neutron_optional_fwaas_pip_packages, []) +
          (neutron_lbaasv2 | bool) | ternary(neutron_optional_lbaas_pip_packages, []) +
-         (neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages, []) }}
+         (neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages, []) +
+         (neutron_oslomsg_amqp1_enabled | bool) | ternary(neutron_optional_oslomsg_amqp1_pip_packages, []) }}
     venv_facts_when_changed:
       - section: "neutron"
         option: "need_db_expand"
diff --git a/vars/distro_install.yml b/vars/distro_install.yml
index a301b2bb..dd74f6ef 100644
--- a/vars/distro_install.yml
+++ b/vars/distro_install.yml
@@ -57,6 +57,9 @@ neutron_package_list: |-
   {% if neutron_developer_mode | bool %}
   {%   set _ = packages.extend(neutron_developer_mode_distro_packages) %}
   {% endif %}
+  {% if neutron_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
   {% set _ = packages.extend(neutron_service_distro_packages) %}
   {{ packages }}
 
diff --git a/vars/main.yml b/vars/main.yml
index afbf4435..4dbf4f51 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -46,6 +46,9 @@ neutron_pip_packages:
   - python-novaclient
   - repoze.lru
 
+neutron_optional_oslomsg_amqp1_pip_packages:
+  - oslo.messaging[amqp1]
+
 neutron_optional_bgp_pip_packages:
   - neutron_dynamic_routing
 
diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index bc0d9c16..15cae2fc 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -103,6 +103,11 @@ neutron_metadata_agent_distro_packages:
 
 neutron_remove_distro_packages: []
 
+neutron_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl-lib
+  - cyrus-sasl-plain
+  - cyrus-sasl-md5
+
 neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
 neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
 _neutron_lbaasv2_user_group: haproxy
diff --git a/vars/source_install.yml b/vars/source_install.yml
index a5c595c7..b425a548 100644
--- a/vars/source_install.yml
+++ b/vars/source_install.yml
@@ -56,6 +56,9 @@ neutron_package_list: |-
   {% if neutron_developer_mode | bool %}
   {% set _ = packages.extend(neutron_developer_mode_distro_packages) %}
   {% endif %}
+  {% if neutron_oslomsg_amqp1_enabled | bool %}
+  {%   set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
+  {% endif %}
   {% set _ = packages.extend(neutron_devel_distro_packages) %}
   {{ packages }}
 
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 16e4a7b4..1bfa7383 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -115,6 +115,11 @@ neutron_metadata_agent_distro_packages:
 
 neutron_remove_distro_packages: []
 
+neutron_oslomsg_amqp1_distro_packages:
+  - cyrus-sasl
+  - cyrus-sasl-plain
+  - cyrus-sasl-digestmd5
+
 neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
 neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
 _neutron_lbaasv2_user_group: nogroup
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index e52e9cb5..bac9422d 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -116,6 +116,10 @@ neutron_metadata_agent_distro_packages:
 neutron_remove_distro_packages:
   - conntrackd
 
+neutron_oslomsg_amqp1_distro_packages:
+  - libsasl2-modules
+  - sasl2-bin
+
 neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
 neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
 _neutron_lbaasv2_user_group: nogroup