openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Create a separate ovn manifest"

Browse Source
This commit is contained in:
Zuul 2022-08-01 08:49:48 +00:00 committed by Gerrit Code Review
commit d87969c40f
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fixtures/scenario003.pp
View File

@ -64,6 +64,7 @@ include openstack_integration::apache
include openstack_integration::memcached include openstack_integration::memcached
include openstack_integration::rabbitmq include openstack_integration::rabbitmq
include openstack_integration::mysql include openstack_integration::mysql
include openstack_integration::ovn
include openstack_integration::keystone include openstack_integration::keystone
include openstack_integration::glance include openstack_integration::glance

1
fixtures/scenario005.pp
View File

@ -44,6 +44,7 @@ include openstack_integration::apache
include openstack_integration::memcached include openstack_integration::memcached
include openstack_integration::rabbitmq include openstack_integration::rabbitmq
include openstack_integration::mysql include openstack_integration::mysql
include openstack_integration::ovn
include openstack_integration::keystone include openstack_integration::keystone
include openstack_integration::glance include openstack_integration::glance
class { 'openstack_integration::neutron': class { 'openstack_integration::neutron':

8
manifests/neutron.pp
View File

@ -260,14 +260,6 @@ class openstack_integration::neutron (
} }
} }
'ovn': { 'ovn': {
class { 'ovn::northd': }
class { 'ovn::controller':
ovn_remote => 'tcp:127.0.0.1:6642',
ovn_encap_ip => '127.0.0.1',
ovn_bridge_mappings => ['external:br-ex'],
ovn_cms_options => 'enable-chassis-as-gw',
manage_ovs_bridge => false,
}
# NOTE(tkajinam): neutron::plugins::ml2::ovn requires neutron::plugins::ml2, # NOTE(tkajinam): neutron::plugins::ml2::ovn requires neutron::plugins::ml2,
# thus it should be included after neutron::plugins::ml2. # thus it should be included after neutron::plugins::ml2.
class { 'neutron::plugins::ml2::ovn': class { 'neutron::plugins::ml2::ovn':

17
manifests/ovn.pp Normal file
View File

@ -0,0 +1,17 @@
# Configure the ovn service
#
class openstack_integration::ovn(
){
include openstack_integration::config
include openstack_integration::params
class { 'ovn::northd': }
class { 'ovn::controller':
ovn_remote => 'tcp:127.0.0.1:6642',
ovn_encap_ip => '127.0.0.1',
ovn_bridge_mappings => ['external:br-ex'],
ovn_cms_options => 'enable-chassis-as-gw',
manage_ovs_bridge => false,
}
}