commit 862cbeb4d1e182d026b32455fab2c5b4fa64bff1
author Slawek Kaplonski <skaplons@redhat.com> Sat Mar 20 10:05:26 2021 +0100
committer Slawek Kaplonski <skaplons@redhat.com> Sat Mar 20 10:05:26 2021 +0100
tree 1eb4d13ac7fe8dc0186d07622313c66e2bfa968b
parent b8204308a2dcb3577e50f9315c526dee21178c32

Set proper OVS_SYSCONFDIR for the job wher OVS is compiled

Devstack's patch [1] introduced new variable OVS_SYSCONFDIR which by
default points to the /etc/openvswitch directory. But in case of the
jobs where OVS is installed from source there is no such directory and
/usr/local/etc/openvswitch should be used instead.

[1] https://review.opendev.org/c/openstack/devstack/+/779991

Change-Id: I240d0df197e89224c2447625130f02d640116ba1
Related-Bug: #1918656

zuul.d/master_jobs.yaml

diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 0b0f174..d5afab6 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -368,6 +368,7 @@
         OVN_BUILD_FROM_SOURCE: True
         OVN_BRANCH: "v20.12.0"
         OVS_BRANCH: "branch-2.15"
+        OVS_SYSCONFDIR: "/usr/local/etc/openvswitch"
       devstack_services:
         br-ex-tcpdump: true
         br-int-flows: true