Remove support for amqp1
Support is removed in oslo.messaging so we remove support in openstack-ansible roles. Change-Id: I401ec5857546b68602dba746aef24557734742f3
This commit is contained in:
committed by
Dmitriy Rabotyagov
parent
0a70ad7623
commit
fb37666407
@@ -118,10 +118,6 @@ manila_oslomsg_rabbit_queue_manager: "{{ oslomsg_rabbit_queue_manager | default(
|
|||||||
manila_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
|
manila_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_delivery_limit | default(0) }}"
|
||||||
manila_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
|
manila_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}"
|
||||||
|
|
||||||
## (Qdrouterd) integration
|
|
||||||
# TODO(evrardjp): Change structure when more backends will be supported
|
|
||||||
manila_oslomsg_amqp1_enabled: "{{ manila_oslomsg_rpc_transport == 'amqp' }}"
|
|
||||||
|
|
||||||
## Manila User / Group
|
## Manila User / Group
|
||||||
manila_system_user_name: manila
|
manila_system_user_name: manila
|
||||||
manila_system_group_name: manila
|
manila_system_group_name: manila
|
||||||
@@ -271,9 +267,6 @@ manila_memcached_servers: "{{ memcached_servers }}"
|
|||||||
|
|
||||||
manila_user_pip_packages: []
|
manila_user_pip_packages: []
|
||||||
|
|
||||||
manila_optional_oslomsg_amqp1_pip_packages:
|
|
||||||
- oslo.messaging[amqp1]
|
|
||||||
|
|
||||||
manila_api_init_overrides: {}
|
manila_api_init_overrides: {}
|
||||||
manila_scheduler_init_overrides: {}
|
manila_scheduler_init_overrides: {}
|
||||||
manila_share_init_overrides: {}
|
manila_share_init_overrides: {}
|
||||||
|
|||||||
@@ -46,10 +46,7 @@
|
|||||||
venv_build_distro_package_list: "{{ manila_devel_distro_packages }}"
|
venv_build_distro_package_list: "{{ manila_devel_distro_packages }}"
|
||||||
venv_install_destination_path: "{{ manila_bin | dirname }}"
|
venv_install_destination_path: "{{ manila_bin | dirname }}"
|
||||||
venv_pip_install_args: "{{ manila_pip_install_args }}"
|
venv_pip_install_args: "{{ manila_pip_install_args }}"
|
||||||
venv_pip_packages: >-
|
venv_pip_packages: "{{ manila_pip_packages | union(manila_user_pip_packages) }}"
|
||||||
{{ manila_pip_packages |
|
|
||||||
union(manila_user_pip_packages) |
|
|
||||||
union(((manila_oslomsg_amqp1_enabled | bool) | ternary(manila_optional_oslomsg_amqp1_pip_packages, []))) }}
|
|
||||||
venv_facts_when_changed:
|
venv_facts_when_changed:
|
||||||
- section: "manila"
|
- section: "manila"
|
||||||
option: "venv_tag"
|
option: "venv_tag"
|
||||||
|
|||||||
@@ -66,8 +66,4 @@ manila_lvm_share_distro_packages:
|
|||||||
|
|
||||||
manila_rbd_share_distro_packages: []
|
manila_rbd_share_distro_packages: []
|
||||||
|
|
||||||
manila_oslomsg_amqp1_distro_packages:
|
|
||||||
- libsasl2-modules
|
|
||||||
- sasl2-bin
|
|
||||||
|
|
||||||
manila_uwsgi_bin: "/usr/bin"
|
manila_uwsgi_bin: "/usr/bin"
|
||||||
|
|||||||
@@ -35,9 +35,6 @@ manila_package_list: |-
|
|||||||
{% if manila_services['manila-scheduler']['group'] in group_names %}
|
{% if manila_services['manila-scheduler']['group'] in group_names %}
|
||||||
{% set _ = packages.extend(manila_scheduler_distro_packages) %}
|
{% set _ = packages.extend(manila_scheduler_distro_packages) %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if manila_oslomsg_amqp1_enabled | bool %}
|
|
||||||
{% set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %}
|
|
||||||
{% endif %}
|
|
||||||
{{ packages }}
|
{{ packages }}
|
||||||
|
|
||||||
_manila_bin: "/usr/bin"
|
_manila_bin: "/usr/bin"
|
||||||
|
|||||||
@@ -52,9 +52,4 @@ manila_lvm_share_distro_packages:
|
|||||||
|
|
||||||
manila_rbd_share_distro_packages: []
|
manila_rbd_share_distro_packages: []
|
||||||
|
|
||||||
manila_oslomsg_amqp1_distro_packages:
|
|
||||||
- cyrus-sasl-lib
|
|
||||||
- cyrus-sasl-plain
|
|
||||||
- cyrus-sasl-md5
|
|
||||||
|
|
||||||
manila_uwsgi_bin: "/usr/sbin"
|
manila_uwsgi_bin: "/usr/sbin"
|
||||||
|
|||||||
@@ -29,9 +29,6 @@ manila_package_list: |-
|
|||||||
{% set _ = packages.extend(manila_rbd_share_distro_packages) %}
|
{% set _ = packages.extend(manila_rbd_share_distro_packages) %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if manila_oslomsg_amqp1_enabled | bool %}
|
|
||||||
{% set _ = packages.extend(manila_oslomsg_amqp1_distro_packages) %}
|
|
||||||
{% endif %}
|
|
||||||
{{ packages }}
|
{{ packages }}
|
||||||
|
|
||||||
_manila_bin: "/openstack/venvs/manila-{{ manila_venv_tag }}/bin"
|
_manila_bin: "/openstack/venvs/manila-{{ manila_venv_tag }}/bin"
|
||||||
|
|||||||
Reference in New Issue
Block a user