diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-22 09:12:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-22 09:12:32 +0000 |
| commit | 1609ffcb4f31f7017fc2b64f41db215a9c66359c (patch) | |
| tree | 1d47a87a5f6b39bb22cea46d13e94be5919d4514 /kolla | |
| parent | 2c8ae3ff53fb9506455ae917802efcebe0687978 (diff) | |
| parent | d4a68553b2337e2f820ff4657faaed433c2b310f (diff) | |
| download | kolla-1609ffcb4f31f7017fc2b64f41db215a9c66359c.tar.gz kolla-1609ffcb4f31f7017fc2b64f41db215a9c66359c.zip | |
Merge "Remove Retired Karbor Support"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 13 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 9bcc51007..72c240d7c 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -101,7 +101,6 @@ _PROFILE_OPTS = [ 'influxdb', 'ironic', 'kafka', - 'karbor', 'kuryr', 'magnum', 'manila', @@ -381,10 +380,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ironic-ui/' 'ironic-ui-${openstack_branch}.tar.gz')}, - 'horizon-plugin-karbor-dashboard': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/karbor-dashboard/' - 'karbor-dashboard-${openstack_branch}.tar.gz')}, 'horizon-plugin-magnum-ui': { 'type': 'url', 'location': ('$tarballs_base/openstack/magnum-ui/' @@ -461,10 +456,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ironic-inspector/' 'ironic-inspector-${openstack_branch}.tar.gz')}, - 'karbor-base': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/karbor/' - 'karbor-${openstack_branch}.tar.gz')}, 'keystone-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/keystone/' @@ -996,10 +987,6 @@ USERS = { 'uid': 42457, 'gid': 42457, }, - 'karbor-user': { - 'uid': 42458, - 'gid': 42458, - }, 'vitrage-user': { 'uid': 42459, 'gid': 42459, diff --git a/kolla/image/build.py b/kolla/image/build.py index 4644809c1..165c974f0 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -101,7 +101,6 @@ UNBUILDABLE_IMAGES = { "blazar-base", "cyborg-base", "freezer-base", - "karbor-base", "kuryr-base", "masakari-base", "monasca-base", |