diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-03 15:04:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-03 15:04:25 +0000 |
| commit | 6a636204e7295c7a384d098b7d070fc8d6630584 (patch) | |
| tree | 4a4deef4e11215068e7cab88e3d9fbc0915f2de9 /kolla | |
| parent | 2807d00a0f4da98ffd2adfaf2ad2dc8511f78d82 (diff) | |
| parent | 8793efcc169f4cea4849ceee3d40fb7282439d19 (diff) | |
| download | kolla-6a636204e7295c7a384d098b7d070fc8d6630584.tar.gz kolla-6a636204e7295c7a384d098b7d070fc8d6630584.zip | |
Merge "Add SNAP support when finding Docker images folder"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index a6736172e..7db9a24a0 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -573,7 +573,12 @@ class KollaWorker(object): possible_paths = ( PROJECT_ROOT, os.path.join(sys.prefix, 'share/kolla'), - os.path.join(sys.prefix, 'local/share/kolla')) + os.path.join(sys.prefix, '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/openstack/snap-kolla + # More info in snap packages https://snapcraft.io + os.path.join(os.environ.get('SNAP', ''), 'share/kolla')) for path in possible_paths: image_path = os.path.join(path, 'docker') |