diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-04 13:53:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-04 13:53:41 +0000 |
| commit | ea6ceef686c018d810a2ff20ca4ba81aa77164e5 (patch) | |
| tree | defd00df6e8a409b28e77249e345d3056cd9d043 /kolla/common | |
| parent | c1e7df7c89af3b5066279deafba212a001f1df84 (diff) | |
| parent | bd90b02708d8c6b88692ec7308a41229fdcdaf22 (diff) | |
| download | kolla-ea6ceef686c018d810a2ff20ca4ba81aa77164e5.tar.gz kolla-ea6ceef686c018d810a2ff20ca4ba81aa77164e5.zip | |
Merge "drop leftovers of RHEL support"
Diffstat (limited to 'kolla/common')
| -rwxr-xr-x | kolla/common/config.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 4fee052b7..e47530397 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -19,18 +19,16 @@ from oslo_config import types from kolla.version import version_info as version -BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'debian'] +BASE_OS_DISTRO = ['centos', 'debian', 'ubuntu'] BASE_ARCH = ['x86_64', 'aarch64'] DEFAULT_BASE_TAGS = { 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream8'}, - 'rhel': {'name': 'registry.access.redhat.com/ubi8', 'tag': 'latest'}, 'debian': {'name': 'debian', 'tag': 'bullseye'}, 'ubuntu': {'name': 'ubuntu', 'tag': '20.04'}, } # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release DISTRO_PRETTY_NAME = { 'centos': 'CentOS Stream 8', - 'rhel': 'Red Hat Enterprise Linux 8', 'debian': 'Debian GNU/Linux 11 (bullseye)', 'ubuntu': 'Ubuntu 20.04', } @@ -42,7 +40,7 @@ DELOREAN = "https://trunk.rdoproject.org/centos8-wallaby/" \ DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-wallaby/" \ "delorean-deps.repo" -INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] +INSTALL_TYPE_CHOICES = ['binary', 'source'] # TODO(mandre) check for file integrity instead of downloading from an HTTPS # source |