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 0a7bf3a07c)
This commit is contained in:
Numan Siddique 2019-10-23 12:43:24 +05:30 committed by Athlan-Guyot sofer
parent 68291df8ac
commit ca6367f191
1 changed files with 15 additions and 0 deletions

View File

@ -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')