diff options
| author | Zuul <zuul@review.opendev.org> | 2021-01-25 22:33:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-01-25 22:33:48 +0000 |
| commit | 124f3ec45b1dd2ed853716cec722e62052e17f66 (patch) | |
| tree | 55e0110e5fb51b6594a415be3d5368d59f1eeef4 /kolla | |
| parent | e275556f93f85d919ec4d789961b5ba13e04df54 (diff) | |
| parent | 0028073ebbe5335847ebaa720122962e494a478a (diff) | |
| download | kolla-124f3ec45b1dd2ed853716cec722e62052e17f66.tar.gz kolla-124f3ec45b1dd2ed853716cec722e62052e17f66.zip | |
Merge "Remove zaqar image and related plugins"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 17 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index b87a70eb0..bf133efde 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -115,7 +115,6 @@ _PROFILE_OPTS = [ 'telegraf', 'trove', 'vitrage', - 'zaqar', 'zookeeper', 'zun', ], @@ -433,10 +432,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher-dashboard/' 'watcher-dashboard-${openstack_branch}.tar.gz')}, - 'horizon-plugin-zaqar-ui': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zaqar-ui/' - 'zaqar-ui-${openstack_branch}.tar.gz')}, 'horizon-plugin-zun-ui': { 'type': 'url', 'location': ('$tarballs_base/openstack/zun-ui/' @@ -666,10 +661,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher-tempest-plugin/' 'watcher-tempest-plugin-master.tar.gz')}, - 'tempest-plugin-zaqar': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zaqar-tempest-plugin/' - 'zaqar-tempest-plugin-master.tar.gz')}, 'rally': { 'type': 'url', 'location': ('$tarballs_base/openstack/rally/' @@ -746,10 +737,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/watcher/' 'watcher-${openstack_branch}.tar.gz')}, - 'zaqar-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/zaqar/' - 'zaqar-${openstack_branch}.tar.gz')}, 'zun-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/zun/' @@ -956,10 +943,6 @@ USERS = { 'uid': 42451, 'gid': 42451, }, - 'zaqar-user': { - 'uid': 42452, - 'gid': 42452, - }, 'zookeeper-user': { 'uid': 42453, 'gid': 42453, diff --git a/kolla/image/build.py b/kolla/image/build.py index d5b058419..9accb7846 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -177,7 +177,6 @@ UNBUILDABLE_IMAGES = { "senlin-health-manager", # no binary package "tacker-base", "vitrage-base", - "zaqar", "neutron-mlnx-agent", }, } |