Merge "Create a separate manifest for ovs and ovs bridge"

openstack/puppet-openstack-integration

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2023年10月17日 10:11:35 +00:00

committed by Gerrit Code Review

parent 7d7ac2e319 84fe2bacef

commit 6ec8700cbd

2 changed files with 39 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/neutron.pp

View File

@@ -108,31 +108,7 @@ class openstack_integration::neutron (

case$driver{

'openvswitch', 'ovn': {

include vswitch::ovs

# Functional test for Open-vSwitch:

# create dummy loopback interface to exercise adding a port to a bridge

vs_bridge { 'br-ex':

ensure => present,

notify => Exec['create_loop1_port'],

}

exec{ 'create_loop1_port':

path => '/usr/bin:/bin:/usr/sbin:/sbin',

provider => shell,

command => 'ip link add name loop1 type dummy && ip addr add 127.2.0.1/24 dev loop1',

refreshonly => true,

}

->vs_port{ 'loop1':

ensure => present,

bridge => 'br-ex',

notify => Exec['create_br-ex_vif'],

}

#createsbr-exvirtualinterfacetoreachfloating-ipnetwork

exec{ 'create_br-ex_vif':

path => '/usr/bin:/bin:/usr/sbin:/sbin',

provider => shell,

command => 'ip addr add 172.24.5.1/24 dev br-ex && ip link set br-ex up',

refreshonly => true,

}

include openstack_integration::ovs

}

'linuxbridge':{

exec { 'create_dummy_iface':

38
manifests/ovs.pp Normal file

View File

@@ -0,0 +1,38 @@

#Configuretheopenvswitchservice

#

#[*manage_bridge*]

#(Optional)Setupbr-exbridge.

#Defaultstotrue.

#

classopenstack_integration::ovs(

$manage_bridge=true

){

include vswitch::ovs

if $manage_bridge {

# Functional test for Open-vSwitch:

# create dummy loopback interface to exercise adding a port to a bridge

vs_bridge { 'br-ex':

ensure => present,

notify => Exec['create_loop1_port'],

}

exec{ 'create_loop1_port':

path => '/usr/bin:/bin:/usr/sbin:/sbin',

provider => shell,

command => 'ip link add name loop1 type dummy && ip addr add 127.2.0.1/24 dev loop1',

refreshonly => true,

}

->vs_port{ 'loop1':

ensure => present,

bridge => 'br-ex',

notify => Exec['create_br-ex_vif'],

}

#createsbr-exvirtualinterfacetoreachfloating-ipnetwork

exec{ 'create_br-ex_vif':

path => '/usr/bin:/bin:/usr/sbin:/sbin',

provider => shell,

command => 'ip addr add 172.24.5.1/24 dev br-ex && ip link set br-ex up',

refreshonly => true,

}