openstack/puppet-openstack-integration
Code Issues Proposed changes

Neutron/Octavia: Ensure ovs/ovn is started

Browse Source 
Change-Id: I64b07a9741023eca6d25890d9e594f3268542643
This commit is contained in:
Takashi Kajinami 2024-10-02 21:40:49 +09:00
parent 0d756eca70
commit b882bdb25e
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/neutron.pp
View File

@ -123,8 +123,11 @@ class openstack_integration::neutron (
} }
case $driver { case $driver {
'openvswitch', 'ovn': { 'openvswitch': {
include openstack_integration::ovs require openstack_integration::ovs
}
'ovn': {
require openstack_integration::ovn
} }
'linuxbridge': { 'linuxbridge': {
exec { 'create_dummy_iface': exec { 'create_dummy_iface':

1
manifests/octavia.pp
View File

@ -134,6 +134,7 @@ class openstack_integration::octavia (
ovn_sb_certificate => '/etc/octavia/ovnsb-cert.pem', ovn_sb_certificate => '/etc/octavia/ovnsb-cert.pem',
ovn_sb_ca_cert => '/etc/octavia/switchcacert.pem', ovn_sb_ca_cert => '/etc/octavia/switchcacert.pem',
} }
require openstack_integration::ovn
} else{ } else{
$enabled_provider_drivers = undef $enabled_provider_drivers = undef
$enabled_provider_agents = undef $enabled_provider_agents = undef

2
manifests/ovn.pp
View File

@ -6,6 +6,8 @@ class openstack_integration::ovn(
include openstack_integration::config include openstack_integration::config
include openstack_integration::params include openstack_integration::params
require openstack_integration::ovs
if $::openstack_integration::config::ssl { if $::openstack_integration::config::ssl {
class { 'vswitch::pki::cacert': } class { 'vswitch::pki::cacert': }
vswitch::pki::cert { ['ovnnb', 'ovnsb', 'ovncontroller']: } vswitch::pki::cert { ['ovnnb', 'ovnsb', 'ovncontroller']: }