Merge "Add check to use /tmp/supervisord_<>.sock if present" into R3.1

Juniper · Feb 17, 2017 · 207a582 · 207a582
2 parents 23dd6cd + f36ac9a
commit 207a582
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