openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "OVN: Use appropriate IP version for OVN db"

Browse Source
This commit is contained in:
Zuul 2023-02-27 21:02:13 +00:00 committed by Gerrit Code Review
commit 8c729c8285
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/neutron.pp
View File

@ -254,8 +254,8 @@ class openstack_integration::neutron (
# NOTE(tkajinam): neutron::plugins::ml2::ovn requires neutron::plugins::ml2,
# thus it should be included after neutron::plugins::ml2.
class { 'neutron::plugins::ml2::ovn':
ovn_nb_connection => 'tcp:127.0.0.1:6641',
ovn_sb_connection => 'tcp:127.0.0.1:6642',
ovn_nb_connection => "tcp:${::openstack_integration::config::ip_for_url}:6641",
ovn_sb_connection => "tcp:${::openstack_integration::config::ip_for_url}:6642",
ovn_metadata_enabled => true,
}
}
@ -289,6 +289,7 @@ class openstack_integration::neutron (
shared_secret => 'a_big_secret',
metadata_host => $metadata_host,
metadata_protocol => $metadata_protocol,
ovn_sb_connection => "tcp:${::openstack_integration::config::ip_for_url}:6642",
}
} else {
class { 'neutron::agents::metadata':

4
manifests/octavia.pp
View File

@ -128,8 +128,8 @@ class openstack_integration::octavia (
}
$enabled_provider_agents = 'ovn'
class { 'octavia::provider::ovn':
ovn_nb_connection => 'tcp:127.0.0.1:6641',
ovn_sb_connection => 'tcp:127.0.0.1:6642',
ovn_nb_connection => "tcp:${::openstack_integration::config::ip_for_url}:6641",
ovn_sb_connection => "tcp:${::openstack_integration::config::ip_for_url}:6642",
}
} else{
$enabled_provider_drivers = $::os_service_default

6
manifests/ovn.pp
View File

@ -6,9 +6,11 @@ class openstack_integration::ovn(
include openstack_integration::config
include openstack_integration::params
class { 'ovn::northd': }
class { 'ovn::northd':
dbs_listen_ip => $::openstack_integration::config::ip_for_url,
}
class { 'ovn::controller':
ovn_remote => 'tcp:127.0.0.1:6642',
ovn_remote => "tcp:${::openstack_integration::config::ip_for_url}:6642",
ovn_encap_ip => '127.0.0.1',
ovn_bridge_mappings => ['external:br-ex'],
ovn_cms_options => 'enable-chassis-as-gw',