Remove support for amqp1
Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I8ba856cef878c8d7aac2c71a78983c5ee177907e
This commit is contained in:
parent
b75ba136bf
commit
df2eb998cd
@ -288,12 +288,6 @@ neutron_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TL
|
||||
neutron_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}"
|
||||
neutron_oslomsg_notify_policies: []
|
||||
|
||||
###
|
||||
### (Qdrouterd) integration
|
||||
###
|
||||
# TODO(evrardjp): Change structure when more backends will be supported
|
||||
neutron_oslomsg_amqp1_enabled: "{{ neutron_oslomsg_rpc_transport == 'amqp' }}"
|
||||
|
||||
###
|
||||
### (RabbitMQ) integration
|
||||
###
|
||||
|
@ -126,7 +126,3 @@ neutron_metadata_agent_distro_packages:
|
||||
|
||||
neutron_remove_distro_packages:
|
||||
- conntrackd
|
||||
|
||||
neutron_oslomsg_amqp1_distro_packages:
|
||||
- libsasl2-modules
|
||||
- sasl2-bin
|
||||
|
@ -57,9 +57,6 @@ neutron_package_list: |-
|
||||
{% if (neutron_services['neutron-ovn-controller']['group'] in group_names and (neutron_plugin_type == 'ml2.ovn') | bool) %}
|
||||
{% set _ = packages.extend(neutron_ovn_controller_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 }}
|
||||
|
||||
|
@ -52,9 +52,6 @@ neutron_pip_packages:
|
||||
# Specific pip packages provided by the user
|
||||
neutron_user_pip_packages: []
|
||||
|
||||
neutron_optional_oslomsg_amqp1_pip_packages:
|
||||
- oslo.messaging[amqp1]
|
||||
|
||||
neutron_optional_bgp_pip_packages:
|
||||
- "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
|
||||
|
||||
@ -103,9 +100,6 @@ neutron_venv_packages: >-
|
||||
{%- if neutron_sfc | bool %}
|
||||
{%- set _ = pkg_list.extend(neutron_optional_sfc_pip_packages) %}
|
||||
{%- endif %}
|
||||
{%- if neutron_oslomsg_amqp1_enabled | bool %}
|
||||
{%- set _ = pkg_list.extend(neutron_optional_oslomsg_amqp1_pip_packages) %}
|
||||
{%- endif %}
|
||||
{%- if (neutron_plugin_type.split('.')[-1] == 'nuage') and
|
||||
(neutron_services['neutron-server']['group'] in group_names) %}
|
||||
{%- set _ = pkg_list.extend(neutron_optional_nuage_pip_packages) %}
|
||||
|
@ -115,8 +115,3 @@ neutron_metadata_agent_distro_packages:
|
||||
- haproxy
|
||||
|
||||
neutron_remove_distro_packages: []
|
||||
|
||||
neutron_oslomsg_amqp1_distro_packages:
|
||||
- cyrus-sasl-lib
|
||||
- cyrus-sasl-plain
|
||||
- cyrus-sasl-md5
|
||||
|
@ -51,9 +51,6 @@ neutron_package_list: |-
|
||||
{% if (neutron_services['neutron-ovn-controller']['group'] in group_names and neutron_plugin_type == 'ml2.ovn') %}
|
||||
{% set _ = packages.extend(neutron_ovn_controller_distro_packages) %}
|
||||
{% endif %}
|
||||
{% if neutron_oslomsg_amqp1_enabled | bool %}
|
||||
{% set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
|
||||
{% endif %}
|
||||
{{ packages }}
|
||||
|
||||
neutron_bin: "/openstack/venvs/neutron-{{ neutron_venv_tag }}/bin"
|
||||
|
Loading…
x
Reference in New Issue
Block a user