Remove support for amqp1

Support is removed in oslo.messaging so we remove support in
openstack-ansible roles.

Change-Id: I07aab02a6d0e954ddd382d230876864a37b0b43d

defaults/main.yml

@@ -44,8 +44,6 @@ mistral_pip_packages:
   - python-memcached
   - systemd-python
 
-mistral_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
 mistral_venv_tag: "{{ venv_tag | default('untagged') }}"
 mistral_bin: "{{ _mistral_bin }}"
 
@@ -140,9 +138,6 @@ mistral_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default
 mistral_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
 mistral_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
 
-# (Qdrouterd) integration
-mistral_oslomsg_amqp1_enabled: "{{ mistral_oslomsg_rpc_transport == 'amqp' }}"
-
 # Database
 mistral_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
 mistral_db_setup_python_interpreter: >-

tasks/mistral_install.yml

@@ -78,10 +78,7 @@
     venv_build_distro_package_list: "{{ mistral_devel_distro_packages }}"
     venv_install_destination_path: "{{ mistral_bin | dirname }}"
     venv_pip_install_args: "{{ mistral_pip_install_args }}"
-    venv_pip_packages: >-
-      {{ mistral_pip_packages |
-           union(mistral_user_pip_packages) |
-             union(((mistral_oslomsg_amqp1_enabled | bool) | ternary(mistral_optional_oslomsg_amqp1_pip_packages, []))) }}
+    venv_pip_packages: "{{ mistral_pip_packages | union(mistral_user_pip_packages) }}"
     venv_facts_when_changed:
       - section: "mistral"
         option: "venv_tag"

vars/debian.yml

@@ -24,8 +24,4 @@ mistral_service_distro_packages:
   - python3-mistral
   - python3-systemd
 
-mistral_oslomsg_amqp1_distro_packages:
-  - libsasl2-modules
-  - sasl2-bin
-
 cache_timeout: 600

vars/distro_install.yml

@@ -15,9 +15,6 @@
 
 mistral_package_list: |-
   {% set packages = mistral_distro_packages + mistral_service_distro_packages %}
-  {% if mistral_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(mistral_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 _mistral_bin: "/usr/bin"

vars/redhat.yml

@@ -25,8 +25,3 @@ mistral_service_distro_packages:
   - openstack-mistral-executor
   - openstack-mistral-notifier
   - python3-systemd
-
-mistral_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl-lib
-  - cyrus-sasl-plain
-  - cyrus-sasl-md5

vars/source_install.yml

@@ -15,9 +15,6 @@
 
 mistral_package_list: |-
   {% set packages = mistral_distro_packages %}
-  {% if mistral_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(mistral_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 _mistral_bin: "/openstack/venvs/mistral-{{ mistral_venv_tag }}/bin"