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 (cherry picked from commit 12a139d)
Juniper · Feb 15, 2017 · f36ac9a · f36ac9a
1 parent 1344d72
commit f36ac9a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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