Setup oslo.messaging extra packages for optional drivers

Change-Id: I2da4d7fd7703993de67aae0dea6c26eeea384787
This commit is contained in:
Andy Smith 2018-07-16 14:53:46 -04:00
parent 3e7c050c05
commit 667d22f309
8 changed files with 30 additions and 1 deletions

View File

@ -260,6 +260,11 @@ neutron_oslomsg_notify_userid: "{{ neutron_oslomsg_rpc_userid }}"
neutron_oslomsg_notify_password: "{{ neutron_oslomsg_rpc_password }}" neutron_oslomsg_notify_password: "{{ neutron_oslomsg_rpc_password }}"
neutron_oslomsg_notify_vhost: "{{ neutron_oslomsg_rpc_vhost }}" neutron_oslomsg_notify_vhost: "{{ neutron_oslomsg_rpc_vhost }}"
###
### (Qdrouterd) integration
###
# TODO(evrardjp): Change structure when more backends will be supported
neutron_oslomsg_amqp1_enabled: "{{ neutron_oslomsg_rpc_transport == 'amqp' }}"
### ###
### (RabbitMQ) integration ### (RabbitMQ) integration

View File

@ -48,7 +48,8 @@
(neutron_fwaas | bool) | ternary(neutron_optional_fwaas_pip_packages, []) + (neutron_fwaas | bool) | ternary(neutron_optional_fwaas_pip_packages, []) +
(neutron_fwaas_v2 | bool) | ternary(neutron_optional_fwaas_pip_packages, []) + (neutron_fwaas_v2 | bool) | ternary(neutron_optional_fwaas_pip_packages, []) +
(neutron_lbaasv2 | bool) | ternary(neutron_optional_lbaas_pip_packages, []) + (neutron_lbaasv2 | bool) | ternary(neutron_optional_lbaas_pip_packages, []) +
(neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages, []) }} (neutron_vpnaas | bool) | ternary(neutron_optional_vpnaas_pip_packages, []) +
(neutron_oslomsg_amqp1_enabled | bool) | ternary(neutron_optional_oslomsg_amqp1_pip_packages, []) }}
venv_facts_when_changed: venv_facts_when_changed:
- section: "neutron" - section: "neutron"
option: "need_db_expand" option: "need_db_expand"

View File

@ -57,6 +57,9 @@ neutron_package_list: |-
{% if neutron_developer_mode | bool %} {% if neutron_developer_mode | bool %}
{% set _ = packages.extend(neutron_developer_mode_distro_packages) %} {% set _ = packages.extend(neutron_developer_mode_distro_packages) %}
{% endif %} {% endif %}
{% if neutron_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
{% endif %}
{% set _ = packages.extend(neutron_service_distro_packages) %} {% set _ = packages.extend(neutron_service_distro_packages) %}
{{ packages }} {{ packages }}

View File

@ -46,6 +46,9 @@ neutron_pip_packages:
- python-novaclient - python-novaclient
- repoze.lru - repoze.lru
neutron_optional_oslomsg_amqp1_pip_packages:
- oslo.messaging[amqp1]
neutron_optional_bgp_pip_packages: neutron_optional_bgp_pip_packages:
- neutron_dynamic_routing - neutron_dynamic_routing

View File

@ -103,6 +103,11 @@ neutron_metadata_agent_distro_packages:
neutron_remove_distro_packages: [] neutron_remove_distro_packages: []
neutron_oslomsg_amqp1_distro_packages:
- cyrus-sasl-lib
- cyrus-sasl-plain
- cyrus-sasl-md5
neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
_neutron_lbaasv2_user_group: haproxy _neutron_lbaasv2_user_group: haproxy

View File

@ -56,6 +56,9 @@ neutron_package_list: |-
{% if neutron_developer_mode | bool %} {% if neutron_developer_mode | bool %}
{% set _ = packages.extend(neutron_developer_mode_distro_packages) %} {% set _ = packages.extend(neutron_developer_mode_distro_packages) %}
{% endif %} {% endif %}
{% if neutron_oslomsg_amqp1_enabled | bool %}
{% set _ = packages.extend(neutron_oslomsg_amqp1_distro_packages) %}
{% endif %}
{% set _ = packages.extend(neutron_devel_distro_packages) %} {% set _ = packages.extend(neutron_devel_distro_packages) %}
{{ packages }} {{ packages }}

View File

@ -115,6 +115,11 @@ neutron_metadata_agent_distro_packages:
neutron_remove_distro_packages: [] neutron_remove_distro_packages: []
neutron_oslomsg_amqp1_distro_packages:
- cyrus-sasl
- cyrus-sasl-plain
- cyrus-sasl-digestmd5
neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
_neutron_lbaasv2_user_group: nogroup _neutron_lbaasv2_user_group: nogroup

View File

@ -116,6 +116,10 @@ neutron_metadata_agent_distro_packages:
neutron_remove_distro_packages: neutron_remove_distro_packages:
- conntrackd - conntrackd
neutron_oslomsg_amqp1_distro_packages:
- libsasl2-modules
- sasl2-bin
neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf"
neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent"
_neutron_lbaasv2_user_group: nogroup _neutron_lbaasv2_user_group: nogroup