Merge "Set ctl socket ownership"

2020-05-04 21:24:38 +00:00 · 2020-05-04 21:24:38 +00:00 · 2e743df516
commit 2e743df516
parent a12ea0244e f2b8bacb26
2 changed files with 13 additions and 0 deletions
--- a/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
+++ b/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl
@ -107,4 +107,12 @@ function stop () {
  ovs-appctl -T1 -t /run/openvswitch/ovs-vswitchd.${PID}.ctl exit
 }

+function poststart () {
+  # This enables the usage of 'ovs-appctl' from neutron-ovs-agent pod.
+
+  PID=$(cat $OVS_PID)
+  OVS_CTL=/run/openvswitch/ovs-vswitchd.${PID}.ctl
+  chown {{ .Values.pod.user.nova.uid }}.{{ .Values.pod.user.nova.uid }} ${OVS_CTL}
+}
+
 $COMMAND
--- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml
+++ b/openvswitch/templates/daemonset-ovs-vswitchd.yaml
@ -112,6 +112,11 @@ It should be handled through lcore and pmd core masks. */}}
            - /tmp/openvswitch-vswitchd.sh
            - start
          lifecycle:
+            postStart:
+              exec:
+                command:
+                  - /tmp/openvswitch-vswitchd.sh
+                  - poststart
            preStop:
              exec:
                command: