From c68a6fe1e7877fb56935d67ca16249a3f8a8b386 Mon Sep 17 00:00:00 2001 From: Maysa Macedo Date: Mon, 4 Jan 2021 18:59:00 +0000 Subject: [PATCH] Fix OVN gates A new Devstack setting was recently introduced[1] for OVN OVN_BUILD_FROM_SOURCE allowing to use the packaged version when set to False. The value of OVS_RUNDIR changes accordingly that setting, so we needs to make sure ovs will always run on same path to avoid database connection failures. [1] https://github.com/openstack/devstack/ commit/e651d9ef8840bb7dd497b557125ce1cd5290993d Change-Id: I3a7b7dcd46cb5efa747d72517b5c26560db698af --- .zuul.d/sdn.yaml | 4 ++-- devstack/local.conf.ovn.sample | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.zuul.d/sdn.yaml b/.zuul.d/sdn.yaml index d232a915b..f2c82ca67 100644 --- a/.zuul.d/sdn.yaml +++ b/.zuul.d/sdn.yaml @@ -31,8 +31,8 @@ Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve Q_ML2_TENANT_NETWORK_TYPE: geneve - VAR_RUN_PATH: /usr/local/var/run Q_USE_PROVIDERNET_FOR_PUBLIC: true + VAR_RUN_PATH: /var/run PHYSICAL_NETWORK: public OVN_L3_CREATE_PUBLIC_NETWORK: true ENABLE_CHASSIS_AS_GW: true @@ -138,8 +138,8 @@ Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve Q_ML2_TENANT_NETWORK_TYPE: geneve - VAR_RUN_PATH: /usr/local/var/run Q_USE_PROVIDERNET_FOR_PUBLIC: true + VAR_RUN_PATH: /var/run PHYSICAL_NETWORK: public OVN_L3_CREATE_PUBLIC_NETWORK: true ENABLE_CHASSIS_AS_GW: true diff --git a/devstack/local.conf.ovn.sample b/devstack/local.conf.ovn.sample index df44f977b..6dc549b05 100644 --- a/devstack/local.conf.ovn.sample +++ b/devstack/local.conf.ovn.sample @@ -43,8 +43,8 @@ enable_service q-svc # VAR RUN PATH # ============= -# VAR_RUN_PATH=/var/run -VAR_RUN_PATH=/usr/local/var/run +# VAR_RUN_PATH=/usr/local/var/run +VAR_RUN_PATH=/var/run # OCTAVIA # Uncomment it to use L2 communication between loadbalancer and member pods