-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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. Conflicts: contrail_provisioning/openstack/scripts/barbican-server-setup.sh (resolved) contrail_provisioning/vcenter_plugin/setup.py (not-applicable) Change-Id: I95a04871950dd29c2104bb04d8ab25da12dfb1a0 Closes-Bug: #1663370 (cherry picked from commit c66b28b)
- Loading branch information
Santosh Gupta
committed
Feb 15, 2017
1 parent
8810880
commit 7071916
Showing
4 changed files
with
18 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters