Remove support for amqp1

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

Change-Id: I8d726f029d0df518ac35e7dfab104effd5f0960b

defaults/main.yml

@@ -119,10 +119,6 @@ heat_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(he
 heat_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
 heat_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
 
-## (Qdrouterd) integration
-# TODO(ansmith): Change structure when more backends will be supported
-heat_oslomsg_amqp1_enabled: "{{ heat_oslomsg_rpc_transport == 'amqp' }}"
-
 ## Heat User / Group
 heat_system_user_name: heat
 heat_system_group_name: heat
@@ -259,9 +255,6 @@ heat_memcached_servers: "{{ memcached_servers }}"
 # Specific pip packages provided by the user
 heat_user_pip_packages: []
 
-heat_optional_oslomsg_amqp1_pip_packages:
-  - oslo.messaging[amqp1]
-
 heat_api_init_overrides: {}
 heat_api_cfn_init_overrides: {}
 heat_engine_init_overrides: {}

tasks/heat_install.yml

@@ -47,9 +47,7 @@
     venv_install_destination_path: "{{ heat_bin | dirname }}"
     venv_install_distro_package_list: "{{ heat_distro_packages }}"
     venv_pip_install_args: "{{ heat_pip_install_args }}"
-    venv_pip_packages: >-
-      {{ heat_pip_packages | union(heat_user_pip_packages) +
-         (heat_oslomsg_amqp1_enabled | bool) | ternary(heat_optional_oslomsg_amqp1_pip_packages, []) }}
+    venv_pip_packages: "{{ heat_pip_packages | union(heat_user_pip_packages) }}"
     venv_facts_when_changed:
       - section: "heat"
         option: "venv_tag"

vars/debian.yml

@@ -28,7 +28,3 @@ heat_devel_distro_packages:
 heat_service_distro_packages:
   - python3-heat
   - python3-systemd
-
-heat_oslomsg_amqp1_distro_packages:
-  - libsasl2-modules
-  - sasl2-bin

vars/distro_install.yml

@@ -15,9 +15,6 @@
 
 heat_package_list: |-
   {% set packages = heat_service_distro_packages %}
-  {% if heat_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(heat_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 heat_bin: "/usr/bin"

vars/redhat.yml

@@ -30,8 +30,3 @@ heat_service_distro_packages:
   - openstack-heat-engine
   - openstack-heat-ui
   - python3-systemd
-
-heat_oslomsg_amqp1_distro_packages:
-  - cyrus-sasl-lib
-  - cyrus-sasl-plain
-  - cyrus-sasl-md5

vars/source_install.yml

@@ -15,9 +15,6 @@
 
 heat_package_list: |-
   {% set packages = heat_distro_packages %}
-  {% if heat_oslomsg_amqp1_enabled | bool %}
-  {%   set _ = packages.extend(heat_oslomsg_amqp1_distro_packages) %}
-  {% endif %}
   {{ packages }}
 
 _heat_bin: "/openstack/venvs/heat-{{ heat_venv_tag }}/bin"