Merge "Installation path added for ubuntu to pathfinder.py"
This commit is contained in:
commit
616d99c5aa
|
@ -109,7 +109,7 @@ KOLLA_SEARCH_PATHS = [
|
||||||
# Search installation paths first
|
# Search installation paths first
|
||||||
os.path.abspath(os.path.join(PathFinder.find_installed_root(),
|
os.path.abspath(os.path.join(PathFinder.find_installed_root(),
|
||||||
'./share/kolla')),
|
'./share/kolla')),
|
||||||
'/usr/share/kolla',
|
'/usr/share/kolla', '/usr/local/share/kolla',
|
||||||
# Then search development paths
|
# Then search development paths
|
||||||
os.path.abspath(os.path.join(PathFinder.find_development_root(),
|
os.path.abspath(os.path.join(PathFinder.find_development_root(),
|
||||||
'../kolla')),
|
'../kolla')),
|
||||||
|
@ -122,7 +122,7 @@ KOLLA_KUBERNETES_SEARCH_PATHS = [
|
||||||
# Search installation paths first
|
# Search installation paths first
|
||||||
os.path.abspath(os.path.join(PathFinder.find_installed_root(),
|
os.path.abspath(os.path.join(PathFinder.find_installed_root(),
|
||||||
'./share/kolla-kubernetes')),
|
'./share/kolla-kubernetes')),
|
||||||
'/usr/share/kolla-kubernetes',
|
'/usr/share/kolla-kubernetes', '/usr/local/share/kolla-kubernetes',
|
||||||
# Then search development paths
|
# Then search development paths
|
||||||
os.path.abspath(os.path.join(PathFinder.find_development_root())),
|
os.path.abspath(os.path.join(PathFinder.find_development_root())),
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue