openstack
/
kolla-kubernetes
Code Issues Proposed changes

Installation path added for ubuntu to pathfinder.py 

For centos system, installation path is /usr/share/kolla and
/usr/share/kolla-kubernetes and for ubuntu system, installation
path is /usr/local/share/kolla and /usr/local/share/kolla-kubernetes.

So, kolla_kubernetes/pathfinder.py not able to search installation path.

Closes-Bug: #1657852

Change-Id: I875c214eece3a3365285a9534744e8ff29e34a08
This commit is contained in:
prameswar 2017-01-20 00:00:55 +05:30
parent 0c92e4bd97
commit 97355d144a
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())),
]