Remove support for amqp1
Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I13f77bb8b63b3cc3d198dcbf918a6708f7d9d80e
This commit is contained in:
parent
61be9e722d
commit
5cdbe69b50
@ -167,10 +167,6 @@ nova_oslomsg_notify_ssl_version: "{{ oslomsg_notify_ssl_version | default('TLSv1
|
|||||||
nova_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}"
|
nova_oslomsg_notify_ssl_ca_file: "{{ oslomsg_notify_ssl_ca_file | default('') }}"
|
||||||
nova_oslomsg_notify_policies: []
|
nova_oslomsg_notify_policies: []
|
||||||
|
|
||||||
## Qdrouterd info
|
|
||||||
# TODO(ansmith): Change structure when more backends will be supported
|
|
||||||
nova_oslomsg_amqp1_enabled: "{{ nova_oslomsg_rpc_transport == 'amqp' }}"
|
|
||||||
|
|
||||||
###
|
###
|
||||||
### RabbitMQ info
|
### RabbitMQ info
|
||||||
###
|
###
|
||||||
@ -571,9 +567,6 @@ nova_pip_packages:
|
|||||||
# Specific pip packages provided by the user
|
# Specific pip packages provided by the user
|
||||||
nova_user_pip_packages: []
|
nova_user_pip_packages: []
|
||||||
|
|
||||||
nova_optional_oslomsg_amqp1_pip_packages:
|
|
||||||
- oslo.messaging[amqp1]
|
|
||||||
|
|
||||||
nova_qemu_user: libvirt-qemu
|
nova_qemu_user: libvirt-qemu
|
||||||
nova_qemu_group: kvm
|
nova_qemu_group: kvm
|
||||||
|
|
||||||
|
@ -63,11 +63,6 @@ nova_compute_packages:
|
|||||||
nova_compute_barbican_distro_packages:
|
nova_compute_barbican_distro_packages:
|
||||||
- cryptsetup
|
- cryptsetup
|
||||||
|
|
||||||
nova_compute_oslomsg_amqp1_distro_packages:
|
|
||||||
- libssl-dev
|
|
||||||
- libsasl2-modules
|
|
||||||
- sasl2-bin
|
|
||||||
|
|
||||||
nova_compute_kvm_distro_packages:
|
nova_compute_kvm_distro_packages:
|
||||||
- libvirt-daemon
|
- libvirt-daemon
|
||||||
- libvirt-daemon-system
|
- libvirt-daemon-system
|
||||||
|
@ -46,9 +46,6 @@ nova_package_list: |-
|
|||||||
{% set _ = packages.extend(nova_compute_barbican_distro_packages) %}
|
{% set _ = packages.extend(nova_compute_barbican_distro_packages) %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% 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) %}
|
{% set _ = packages.extend(nova_service_distro_packages) %}
|
||||||
{{ packages }}
|
{{ packages }}
|
||||||
|
|
||||||
|
@ -47,9 +47,6 @@ _nova_ironic_used: |-
|
|||||||
|
|
||||||
nova_venv_packages: |-
|
nova_venv_packages: |-
|
||||||
{%- set pkg_list = nova_pip_packages | union(nova_user_pip_packages) %}
|
{%- set pkg_list = nova_pip_packages | union(nova_user_pip_packages) %}
|
||||||
{%- if nova_oslomsg_amqp1_enabled | bool %}
|
|
||||||
{%- set _ = pkg_list.extend(nova_optional_oslomsg_amqp1_pip_packages) %}
|
|
||||||
{%- endif %}
|
|
||||||
{%- if nova_blazar_enabled | bool %}
|
{%- if nova_blazar_enabled | bool %}
|
||||||
{%- if (nova_services['nova-scheduler']['group'] in group_names) %}
|
{%- if (nova_services['nova-scheduler']['group'] in group_names) %}
|
||||||
{%- set _ = pkg_list.extend(nova_blazar_pip_packages) %}
|
{%- set _ = pkg_list.extend(nova_blazar_pip_packages) %}
|
||||||
|
@ -84,7 +84,3 @@ nova_compute_kvm_pip_packages:
|
|||||||
|
|
||||||
nova_compute_ksm_packages:
|
nova_compute_ksm_packages:
|
||||||
- ksmtuned
|
- ksmtuned
|
||||||
|
|
||||||
nova_compute_oslomsg_amqp1_distro_packages:
|
|
||||||
- cyrus-sasl-plain
|
|
||||||
- cyrus-sasl-md5
|
|
||||||
|
@ -32,9 +32,6 @@ nova_package_list: |-
|
|||||||
{% set _ = packages.extend(nova_compute_barbican_distro_packages) %}
|
{% set _ = packages.extend(nova_compute_barbican_distro_packages) %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if nova_oslomsg_amqp1_enabled | bool %}
|
|
||||||
{% set _ = packages.extend(nova_compute_oslomsg_amqp1_distro_packages) %}
|
|
||||||
{% endif %}
|
|
||||||
{{ packages }}
|
{{ packages }}
|
||||||
|
|
||||||
_nova_bin: "/openstack/venvs/nova-{{ nova_venv_tag }}/bin"
|
_nova_bin: "/openstack/venvs/nova-{{ nova_venv_tag }}/bin"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user