Fix _get_images_dir when pip-installed with --user

There are two cases where pip installs kolla share into ~/.local/share/kolla:

- with `pip install --user kolla`
- with `pip install kolla` as non-root

This patch helps kolla find the share dir in these cases.

Closes-Bug: #1930544

Change-Id: I0b3eb6744a34a601266179fb358510a5c500e6ba
This commit is contained in:
James Pic 2021-06-02 09:42:35 +02:00 committed by jpic
parent 5338b559ea
commit db78657c23
2 changed files with 6 additions and 0 deletions

View File

@ -753,6 +753,7 @@ class KollaWorker(object):
PROJECT_ROOT,
os.path.join(sys.prefix, 'share/kolla'),
os.path.join(sys.prefix, 'local/share/kolla'),
os.path.join(os.getenv('HOME', ''), '.local/share/kolla'),
# NOTE(zioproto): When Kolla is used within a snap, the env var
# $SNAP is the directory where the snap is mounted.
# https://github.com/zioproto/snap-kolla

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fix support for kolla install in ``~/.local``. `LP#1930544
<https://launchpad.net/bugs/1930544>`__