From 67b7d7cd428a98389f231b76bcb74d7b97bb0fe2 Mon Sep 17 00:00:00 2001 From: mid_one Date: Fri, 29 Mar 2019 02:14:40 +0800 Subject: [PATCH] Register configuration for ovsdb-server and ovs-vswitchd with pmon daemon Linking pmon configuration files for ovsdb-server and ovs-vswitchd to link_path in /etc/pmon.d. Doing this will register the configuration with pmon daemon. Change-Id: Icf2fff05782db1ea9f3bf8410ee982366d148d99 Story: #2002947 Task: #22942 Depends-On: https://review.openstack.org/#/c/648330/ Signed-off-by: Chenjie Xu --- .../src/modules/platform/manifests/vswitch.pp | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/puppet-manifests/src/modules/platform/manifests/vswitch.pp b/puppet-manifests/src/modules/platform/manifests/vswitch.pp index 674b0006dc..e4be759ea9 100644 --- a/puppet-manifests/src/modules/platform/manifests/vswitch.pp +++ b/puppet-manifests/src/modules/platform/manifests/vswitch.pp @@ -135,6 +135,28 @@ class platform::vswitch::ovs( Vs_config<||> -> Platform::Vswitch::Ovs::Bridge<||> } + if $::platform::params::vswitch_type == 'ovs-dpdk' { + $pmon_ensure = link + } else { + $pmon_ensure = absent + } + + file { '/etc/pmon.d/ovsdb-server.conf': + ensure => $pmon_ensure, + target => '/etc/openvswitch/ovsdb-server.pmon.conf', + owner => 'root', + group => 'root', + mode => '0644', + } + + file { '/etc/pmon.d/ovs-vswitchd.conf': + ensure => $pmon_ensure, + target => '/etc/openvswitch/ovs-vswitchd.pmon.conf', + owner => 'root', + group => 'root', + mode => '0644', + } + if $::platform::params::vswitch_type =~ '^ovs' { # clean bridges and ports before applying current configuration