Merge "Adds haproxy endpoints for networking-ovn support"

This commit is contained in:
Zuul 2018-12-03 06:37:37 +00:00 committed by Gerrit Code Review
commit a2177e9a45
5 changed files with 55 additions and 2 deletions

View File

@ -41,6 +41,12 @@ component_skel:
neutron_metadata_agent:
belongs_to:
- neutron_all
neutron_ovn_controller:
belongs_to:
- neutron_all
neutron_ovn_northd:
belongs_to:
- neutron_all
neutron_sriov_nic_agent:
belongs_to:
- neutron_all
@ -51,7 +57,6 @@ component_skel:
belongs_to:
- neutron_all
container_skel:
neutron_agents_container:
belongs_to:
@ -69,6 +74,11 @@ container_skel:
- neutron_sriov_nic_agent
properties:
is_metal: true
neutron_ovn_northd_container:
belongs_to:
- network_containers
contains:
- neutron_ovn_northd
neutron_server_container:
belongs_to:
- network_containers
@ -76,7 +86,6 @@ container_skel:
- neutron_server
- opendaylight
physical_skel:
network_containers:
belongs_to:

View File

@ -59,6 +59,7 @@ container_skel:
contains:
- neutron_linuxbridge_agent
- neutron_openvswitch_agent
- neutron_ovn_controller
- neutron_sriov_nic_agent
- nova_compute
properties:

View File

@ -347,3 +347,39 @@ haproxy_default_services:
haproxy_backend_httpcheck_options:
- expect rstatus 200|405
haproxy_service_enabled: "{{ (groups['ceph-rgw'] is defined and groups['ceph-rgw'] | length > 0) or (ceph_rgws | length > 0) }}"
- service:
haproxy_service_name: neutron_ovn_northd_northbound
haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}" # list expected
haproxy_backup_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[1:] }}"
haproxy_port: 6641
haproxy_bind: "{{ [internal_lb_vip_address] }}"
haproxy_balance_type: tcp
haproxy_timeout_client: 90m
haproxy_timeout_server: 90m
haproxy_backend_options:
- tcpka
haproxy_service_enabled: "{{ groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0 }}"
- service:
haproxy_service_name: neutron_ovn_northd_southbound
haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}"
haproxy_backup_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[1:] }}"
haproxy_port: 6642
haproxy_bind: "{{ [internal_lb_vip_address] }}"
haproxy_balance_type: tcp
haproxy_timeout_client: 90m
haproxy_timeout_server: 90m
haproxy_backend_options:
- tcpka
haproxy_service_enabled: "{{ groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0 }}"
- service:
haproxy_service_name: neutron_ovn_ovsdb_server
haproxy_backend_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[:1] }}"
haproxy_backup_nodes: "{{ (groups['neutron_ovn_northd'] | default([]))[1:] }}"
haproxy_port: 6640
haproxy_bind: "{{ [internal_lb_vip_address] }}"
haproxy_balance_type: tcp
haproxy_timeout_client: 90m
haproxy_timeout_server: 90m
haproxy_backend_options:
- tcpka
haproxy_service_enabled: "{{ groups['neutron_ovn_northd'] is defined and groups['neutron_ovn_northd'] | length > 0 }}"

View File

@ -143,6 +143,8 @@ neutron_linuxbridge_agent
neutron_metadata_agent
neutron_metering_agent
neutron_openvswitch_agent
neutron_ovn_controller
neutron_ovn_northd
neutron_server
neutron_sriov_nic_agent
[neutron_agent]
@ -154,6 +156,8 @@ neutron_sriov_nic_agent
[neutron_metadata_agent]
[neutron_metering_agent]
[neutron_openvswitch_agent]
[neutron_ovn_controller]
[neutron_ovn_northd]
[neutron_server]
[neutron_sriov_nic_agent]

View File

@ -340,6 +340,9 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
'neutron_metadata_agent',
'neutron_metering_agent',
'neutron_openvswitch_agent',
'neutron_ovn_controller',
'neutron_ovn_northd',
'neutron_ovn_northd_container',
'neutron_sriov_nic_agent',
'neutron_server',
'neutron_server_container',