From 8ba8fb649df78f1d8be44cc15ef4f185433d679e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 3 Jul 2022 01:52:17 +0900 Subject: [PATCH] Create a separate ovn manifest ... so that we can reuse the manifest in acceptance tests. Change-Id: I4ecc5ec4271badabbf421eade7f32ea006d773b2 --- fixtures/scenario003.pp | 1 + fixtures/scenario005.pp | 1 + manifests/neutron.pp | 8 -------- manifests/ovn.pp | 17 +++++++++++++++++ 4 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 manifests/ovn.pp diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index f7f771d15..9e4a55f5b 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -72,6 +72,7 @@ include openstack_integration::apache include openstack_integration::memcached include openstack_integration::rabbitmq include openstack_integration::mysql +include openstack_integration::ovn include openstack_integration::keystone include openstack_integration::glance diff --git a/fixtures/scenario005.pp b/fixtures/scenario005.pp index a2d28076c..afcd3481a 100644 --- a/fixtures/scenario005.pp +++ b/fixtures/scenario005.pp @@ -44,6 +44,7 @@ include openstack_integration::apache include openstack_integration::memcached include openstack_integration::rabbitmq include openstack_integration::mysql +include openstack_integration::ovn include openstack_integration::keystone include openstack_integration::glance class { 'openstack_integration::neutron': diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 5b97b0744..d98e94d69 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -260,14 +260,6 @@ class openstack_integration::neutron ( } } '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, # thus it should be included after neutron::plugins::ml2. class { 'neutron::plugins::ml2::ovn': diff --git a/manifests/ovn.pp b/manifests/ovn.pp new file mode 100644 index 000000000..be5668942 --- /dev/null +++ b/manifests/ovn.pp @@ -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, + } +}