diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-11-12 13:14:22 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2019-11-13 09:17:34 +0100 |
| commit | a20fa84e29a1f3e7afb15d008c05f37aa58ee3c0 (patch) | |
| tree | 8bbaa798055787358a8436b5a3b352ab28ab7d9c /kolla | |
| parent | dcbc0bd89a24cd93aa8fc46a644c9d4c19dad4d5 (diff) | |
| download | kolla-a20fa84e29a1f3e7afb15d008c05f37aa58ee3c0.tar.gz kolla-a20fa84e29a1f3e7afb15d008c05f37aa58ee3c0.zip | |
Remove deprecated images
Change-Id: I2fe57f7cd79724fa8a36bd702d75b013a68ecd1b
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 14 | ||||
| -rwxr-xr-x | kolla/image/build.py | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index ac46a3c03..765a4803e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -93,13 +93,11 @@ _PROFILE_OPTS = [ help='Main images'), cfg.ListOpt('aux', default=[ - 'almanach', 'aodh', 'blazar', 'cloudkitty', 'congress', 'designate', - 'dragonflow', 'ec2-api', 'freezer', 'gnocchi', @@ -284,10 +282,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/requirements/' 'requirements-stable-train.tar.gz')}, - 'almanach-base': { - 'type': 'url', - 'location': ('$tarballs_base/almanach/' - 'almanach-4.1.0.tar.gz')}, 'aodh-base': { 'type': 'url', 'location': ('$tarballs_base/aodh/' @@ -332,10 +326,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/designate/' 'designate-9.0.0.tar.gz')}, - 'dragonflow-base': { - 'type': 'url', - 'location': ('$tarballs_base/dragonflow/' - 'dragonflow-3.0.0.tar.gz')}, 'ec2-api': { 'type': 'url', 'location': ('$tarballs_base/ec2-api/' @@ -1092,7 +1082,7 @@ USERS = { 'uid': 42463, 'gid': 42463, }, - 'dragonflow-user': { + 'dragonflow-user': { # unused user (dragonflow dropped) 'uid': 42464, 'gid': 42464, }, @@ -1136,7 +1126,7 @@ USERS = { 'uid': 42474, 'gid': 42474, }, - 'almanach-user': { + 'almanach-user': { # unused user (almanach dropped) 'uid': 42475, 'gid': 42475, }, diff --git a/kolla/image/build.py b/kolla/image/build.py index 7ab1bd33b..c313f8525 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -96,8 +96,6 @@ UNBUILDABLE_IMAGES = { "elasticsearch", # no binary package "grafana", # no binary package "kibana", # no binary package - "kube-proxy", # no binary - "helm-repository", # no binary "monasca-grafana", # no phantomJS "opendaylight", # no binary package "prometheus-base", # no ppc64le binaries @@ -109,11 +107,9 @@ UNBUILDABLE_IMAGES = { "tripleoclient", }, 'binary': { - "almanach-base", "bifrost-base", "blazar-base", "cyborg-base", - "dragonflow-base", "freezer-base", "karbor-base", "kuryr-base", |