From ca6367f1915ea38a910476e28c1c3f474d4865db Mon Sep 17 00:00:00 2001
From: Numan Siddique <nusiddiq@redhat.com>
Date: Wed, 23 Oct 2019 12:43:24 +0530
Subject: [PATCH] ovn-dbs-bundle: Prepare for supporting new OVN version with
 separarte run dirs

This patch prepares the ground for using the latest OVN. OVN is split from
openvswitch and it has its own code repo. After the split, OVN has its
own run dir (/var/run/ovn), db dir (/etc/ovn/), log dir (/var/logs/ovn)
and datadir - /usr/share/ovn/scripts.

With this patch, it supports running older version (2.11) or new
version (2.12) without any issues. It mounts the host directories accordingly
so that there is no impact when OVN is updated.

Change-Id: I5d778cbeb2863ec0fe649799863752e8eb16492f
Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
(cherry picked from commit 0a7bf3a07cd63e979389587bb1b8985dcf8a3842)
---
 manifests/profile/pacemaker/ovn_dbs_bundle.pp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/manifests/profile/pacemaker/ovn_dbs_bundle.pp b/manifests/profile/pacemaker/ovn_dbs_bundle.pp
index f4986fff3..543d500b3 100644
--- a/manifests/profile/pacemaker/ovn_dbs_bundle.pp
+++ b/manifests/profile/pacemaker/ovn_dbs_bundle.pp
@@ -166,16 +166,31 @@ class tripleo::profile::pacemaker::ovn_dbs_bundle (
           'target-dir' => '/run/openvswitch',
           'options'    => 'rw',
         },
+        'ovn-dbs-new-run-files' => {
+          'source-dir' => '/var/lib/openvswitch/ovn',
+          'target-dir' => '/run/ovn',
+          'options'    => 'rw',
+        },
         'ovn-dbs-log-files' => {
           'source-dir' => '/var/log/containers/openvswitch',
           'target-dir' => '/var/log/openvswitch',
           'options'    => 'rw',
         },
+        'ovn-dbs-new-log-files' => {
+          'source-dir' => '/var/log/containers/openvswitch',
+          'target-dir' => '/var/log/ovn',
+          'options'    => 'rw',
+        },
         'ovn-dbs-db-path'   => {
           'source-dir' => '/var/lib/openvswitch/ovn',
           'target-dir' => '/etc/openvswitch',
           'options'    => 'rw',
         },
+        'ovn-dbs-new-db-path'   => {
+          'source-dir' => '/var/lib/openvswitch/ovn',
+          'target-dir' => '/etc/ovn',
+          'options'    => 'rw',
+        },
       }
       if (hiera('ovn_dbs_short_node_names_override', undef)) {
         $ovn_dbs_short_node_names = hiera('ovn_dbs_short_node_names_override')