From c3fe19f259724e45c635ccb298afc54e1313637d Mon Sep 17 00:00:00 2001
From: Kudaka Poorna Rajesh <rajesh.kudaka@imaginea.com>
Date: Mon, 3 Aug 2020 15:05:38 +0000
Subject: [PATCH] Revert "Remove ctl socket ownership"

OVS_CTL file is required by other parts of the init
script.

This reverts commit a9693843d77525decefc8a0ba0528624f9e11350.

Change-Id: Ia11dc18e0b13d5fe01918a4c7febb82b19303527
---
 neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
index 8444159a0d..854acb3e8a 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
@@ -19,6 +19,11 @@ set -ex
 OVS_SOCKET=/run/openvswitch/db.sock
 chown neutron: ${OVS_SOCKET}
 
+# This enables the usage of 'ovs-appctl' from neutron pod.
+OVS_PID=$(cat /run/openvswitch/ovs-vswitchd.pid)
+OVS_CTL=/run/openvswitch/ovs-vswitchd.${OVS_PID}.ctl
+chown neutron: ${OVS_CTL}
+
 function get_dpdk_config_value {
   values=$1
   filter=$2