diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-18 13:21:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-18 13:21:23 +0000 |
| commit | fa09b3e077340c2d07bbe6aad9c34f8d5b372dcb (patch) | |
| tree | 091ab1b6eda8a984a3acdc7172a3d39702ef2462 /kolla | |
| parent | b70090982485c2a41da0630a7a78aea9f87b4edb (diff) | |
| parent | 5fd23773641900ad5eebffbeea2e3d96cef138d8 (diff) | |
| download | kolla-fa09b3e077340c2d07bbe6aad9c34f8d5b372dcb.tar.gz kolla-fa09b3e077340c2d07bbe6aad9c34f8d5b372dcb.zip | |
Merge "Support filtering output of --list-images"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 50b7c2224..baafb7a92 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -160,7 +160,7 @@ _CLI_OPTS = [ cfg.BoolOpt('list-dependencies', short='l', help='Show image dependencies (filtering supported)'), cfg.BoolOpt('list-images', - help='Show all available images'), + help='Show all available images (filtering supported)'), cfg.StrOpt('namespace', short='n', default='kolla', help='The Docker namespace name'), cfg.BoolOpt('cache', default=True, diff --git a/kolla/image/build.py b/kolla/image/build.py index 0f4179200..3e8058f07 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -898,7 +898,9 @@ class KollaWorker(object): f.write(dot.source) def list_images(self): - for count, image in enumerate(self.images): + for count, image in enumerate([ + image for image in self.images if image.status == STATUS_MATCHED + ]): print(count + 1, ':', image.name) def list_dependencies(self): @@ -1001,6 +1003,8 @@ def run_build(): return if conf.list_images: kolla.build_image_list() + kolla.find_parents() + kolla.filter_images() kolla.list_images() return if conf.list_dependencies: |