From 12a139d710bbab53d52a0c7c6f6e8c8da524cc13 Mon Sep 17 00:00:00 2001
From: Santosh Gupta <sangupta@juniper.net>
Date: Thu, 9 Feb 2017 16:57:15 -0800
Subject: [PATCH] Add check to use /tmp/supervisord_<>.sock if present

After upgrade config files might still have old location for socket files.
Check if socket file is present in /tmp/, if not then use the one in /var/run.

Following obsolete files are not being updated. Will delete them as separate bug.
common/control_files/supervisor-{analytics|control|vrouter|webui}.service

Change-Id: Ib58b12cd3284e22408ee6413912a666442e7a558
Closes-Bug: #1663370
---
 common/control_files/barbican-api.initd.supervisord    | 6 +++++-
 common/control_files/barbican-worker.initd.supervisord | 6 +++++-
 common/control_files/supervisor-analytics.service      | 6 +++++-
 common/control_files/supervisor-control.service        | 6 +++++-
 common/control_files/supervisor-vrouter.service        | 6 +++++-
 common/control_files/supervisor-webui.service          | 6 +++++-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/common/control_files/barbican-api.initd.supervisord b/common/control_files/barbican-api.initd.supervisord
index 20c0099d5..90f40aee3 100755
--- a/common/control_files/barbican-api.initd.supervisord
+++ b/common/control_files/barbican-api.initd.supervisord
@@ -3,4 +3,8 @@
 # chkconfig: 2345 99 01
 # description: Juniper Network Virtualization API
 
-supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+if [ -e /tmp/supervisord_openstack.sock ]; then
+    supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+else
+    supervisorctl -s unix:///var/run/supervisord_openstack.sock ${1} `basename ${0}`
+fi
diff --git a/common/control_files/barbican-worker.initd.supervisord b/common/control_files/barbican-worker.initd.supervisord
index 20c0099d5..90f40aee3 100755
--- a/common/control_files/barbican-worker.initd.supervisord
+++ b/common/control_files/barbican-worker.initd.supervisord
@@ -3,4 +3,8 @@
 # chkconfig: 2345 99 01
 # description: Juniper Network Virtualization API
 
-supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+if [ -e /tmp/supervisord_openstack.sock ]; then
+    supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+else
+    supervisorctl -s unix:///var/run/supervisord_openstack.sock ${1} `basename ${0}`
+fi
diff --git a/common/control_files/supervisor-analytics.service b/common/control_files/supervisor-analytics.service
index 72ceafe17..ad424c4ae 100644
--- a/common/control_files/supervisor-analytics.service
+++ b/common/control_files/supervisor-analytics.service
@@ -5,7 +5,11 @@ After=syslog.target network.target
 [Service]
 Restart=always
 ExecStart=/usr/bin/supervisord -n -c /etc/contrail/supervisord_analytics.conf
-ExecStopPre=/usr/bin/supervisorctl -s unix:///var/run/supervisord_analytics.sock stop all
+ExecStopPre=if [ -e /tmp/supervisord_analytics.sock ]; then \
+                /usr/bin/supervisorctl -s unix:///tmp/supervisord_analytics.sock stop all \
+            else \
+                /usr/bin/supervisorctl -s unix:///var/run/supervisord_analytics.sock stop all \
+            fi
 ExecStopPost=/usr/bin/supervisor_killall /etc/contrail/supervisord_analytics_files
 LimitCORE=infinity
 LimitNOFILE=4096
diff --git a/common/control_files/supervisor-control.service b/common/control_files/supervisor-control.service
index 67b72b8f8..c734ca5cb 100644
--- a/common/control_files/supervisor-control.service
+++ b/common/control_files/supervisor-control.service
@@ -5,7 +5,11 @@ After=syslog.target network.target
 [Service]
 Restart=always
 ExecStart=/usr/bin/supervisord -n -c /etc/contrail/supervisord_control.conf
-ExecStopPre=/usr/bin/supervisorctl -s unix:///var/run/supervisord_control.sock stop all
+ExecStopPre=if [ -e /tmp/supervisord_control.sock ]; then \
+                /usr/bin/supervisorctl -s unix:///tmp/supervisord_control.sock stop all \
+            else \
+                /usr/bin/supervisorctl -s unix:///var/run/supervisord_control.sock stop all \
+            fi
 ExecStopPost=/usr/bin/supervisor_killall /etc/contrail/supervisord_control_files
 LimitCORE=infinity
 LimitNOFILE=4096
diff --git a/common/control_files/supervisor-vrouter.service b/common/control_files/supervisor-vrouter.service
index 3ff3b264b..ed4664b13 100644
--- a/common/control_files/supervisor-vrouter.service
+++ b/common/control_files/supervisor-vrouter.service
@@ -7,7 +7,11 @@ Restart=always
 ExecStartPre=/etc/contrail/vnagent_ExecStartPre.sh
 ExecStart=/usr/bin/supervisord -n -c /etc/contrail/supervisord_vrouter.conf
 ExecStartPost=/etc/contrail/vnagent_ExecStartPost.sh
-ExecStopPre=/usr/bin/supervisorctl -s unix:///var/run/supervisord_vrouter.sock stop all
+ExecStopPre=if [ -e /tmp/supervisord_vrouter.sock ]; then \
+                /usr/bin/supervisorctl -s unix:///tmp/supervisord_vrouter.sock stop all \
+            else \
+                /usr/bin/supervisorctl -s unix:///var/run/supervisord_vrouter.sock stop all \
+            fi
 ExecStopPost=/usr/bin/supervisor_killall /etc/contrail/supervisord_vrouter_files
 ExecStopPost=/etc/contrail/vnagent_ExecStopPost.sh
 LimitCORE=infinity
diff --git a/common/control_files/supervisor-webui.service b/common/control_files/supervisor-webui.service
index 9a5abcbc1..f5e59a374 100755
--- a/common/control_files/supervisor-webui.service
+++ b/common/control_files/supervisor-webui.service
@@ -5,7 +5,11 @@ After=redis.service
 [Service]
 Restart=always
 ExecStart=/usr/bin/supervisord -n -c /etc/contrail/supervisord_webui.conf
-ExecStopPre=/usr/bin/supervisorctl -s unix:///var/run/supervisord_webui.sock stop all
+ExecStopPre=if [ -e /tmp/supervisord_webui.sock ]; then \
+                /usr/bin/supervisorctl -s unix:///tmp/supervisord_webui.sock stop all \
+            else \
+                /usr/bin/supervisorctl -s unix:///var/run/supervisord_webui.sock stop all \
+            fi
 ExecStopPost=/usr/bin/supervisor_killall /etc/contrail/supervisord_webui_files
 LimitCORE=infinity
 LimitNOFILE=4096