openstack
/
kolla-kubernetes
Code Issues Proposed changes

Merge "Installation path added for ubuntu to pathfinder.py"

This commit is contained in:
Jenkins 2017-04-14 19:09:28 +00:00 committed by Gerrit Code Review
parent 780c166858 97355d144a
commit 616d99c5aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kolla_kubernetes/pathfinder.py
View File

@ -109,7 +109,7 @@ KOLLA_SEARCH_PATHS = [
# Search installation paths first
os.path.abspath(os.path.join(PathFinder.find_installed_root(),
'./share/kolla')),
'/usr/share/kolla',
'/usr/share/kolla', '/usr/local/share/kolla',
# Then search development paths
os.path.abspath(os.path.join(PathFinder.find_development_root(),
'../kolla')),
@ -122,7 +122,7 @@ KOLLA_KUBERNETES_SEARCH_PATHS = [
# Search installation paths first
os.path.abspath(os.path.join(PathFinder.find_installed_root(),
'./share/kolla-kubernetes')),
'/usr/share/kolla-kubernetes',
'/usr/share/kolla-kubernetes', '/usr/local/share/kolla-kubernetes',
# Then search development paths
os.path.abspath(os.path.join(PathFinder.find_development_root())),
]