openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Set ovn_chassis_mac_map in ovn::controller" into stable/victoria

This commit is contained in:
Zuul 2021-04-14 14:45:33 +00:00 committed by Gerrit Code Review
parent c34e3e3bd0 d35ec105a0
commit 6de7c0f772
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/profile/base/neutron/agents/ovn.pp
View File

@ -33,15 +33,27 @@
# for more details.
# Defaults to hiera('step')
#
# [*ovn_chassis_mac_map*]
# (optional) A list of key-value pairs that map a chassis specific mac to
# a physical network name. An example
# value mapping two chassis macs to two physical network names would be:
# physnet1:aa:bb:cc:dd:ee:ff,physnet2:a1:b2:c3:d4:e5:f6
# These are the macs that ovn-controller will replace a router port
# mac with, if packet is going from a distributed router port on
# vlan type logical switch.
# Defaults to hiera('ovn_chassis_mac_map')
#
class tripleo::profile::base::neutron::agents::ovn (
$ovn_db_host = hiera('ovn_dbs_vip'),
$ovn_sbdb_port = hiera('ovn::southbound::port'),
$protocol = 'tcp',
$step = Integer(hiera('step'))
$ovn_db_host = hiera('ovn_dbs_vip'),
$ovn_sbdb_port = hiera('ovn::southbound::port'),
$protocol = 'tcp',
$step = Integer(hiera('step')),
$ovn_chassis_mac_map = hiera('ovn_chassis_mac_map', undef),
) {
if $step >= 4 {
class { 'ovn::controller':
ovn_remote => join([$protocol, normalize_ip_for_uri($ovn_db_host), "${ovn_sbdb_port}"], ':'),
ovn_remote => join([$protocol, normalize_ip_for_uri($ovn_db_host), "${ovn_sbdb_port}"], ':'),
ovn_chassis_mac_map => $ovn_chassis_mac_map,
}
}
}