diff options
Diffstat (limited to 'kolla/template')
| -rw-r--r-- | kolla/template/methods.py | 12 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 26 |
2 files changed, 9 insertions, 29 deletions
diff --git a/kolla/template/methods.py b/kolla/template/methods.py index fb470a65f..19fcf4e22 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -100,11 +100,6 @@ def handle_repos(context, reponames, mode): base_package_type = context.get('base_package_type') base_distro = context.get('base_distro') base_arch = context.get('base_arch') - distro_package_manager = context.get('distro_package_manager') - - # TODO(mgoddard): Remove this when CentOS 7 support is no longer present. - if base_distro == 'centos' and distro_package_manager == 'dnf': - base_distro = 'centos8' commands = '' @@ -130,11 +125,8 @@ def handle_repos(context, reponames, mode): if base_package_type == 'rpm' and commands: # NOTE(hrw): if commands is empty then no repos are enabled # otherwise we need to add command to handle repositories - if distro_package_manager == 'yum': - commands = 'yum-config-manager %s' % commands - elif distro_package_manager == 'dnf': - # NOTE(hrw) dnf errors out if we enable unknown repo - commands = 'dnf config-manager %s || true' % commands + # NOTE(hrw) dnf errors out if we enable unknown repo + commands = 'dnf config-manager %s || true' % commands elif base_package_type == 'deb': # NOTE(hrw): Debian commands end with '&&' commands = commands[0:-4] diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index e3cb9cbbb..1ed325141 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -1,56 +1,44 @@ --- -# TODO(mgoddard): Remove this when CentOS 7 support is no longer present. +# TODO(mnasiadka): Rework the repo list once Ceph Octopus is released centos: ceph: "centos-ceph-nautilus" elasticsearch: "elasticsearch-kibana-logstash-6.x" epel: "epel" + epel-modular: "epel-modular" erlang: "rabbitmq_rabbitmq-erlang" extras: "extras" grafana: "grafana" - hacluster: "network_ha-clustering_Stable" + hacluster: "HighAvailability" influxdb: "influxdb" kibana: "elasticsearch-kibana-logstash-6.x" nfs-ganesha: "centos-nfs-ganesha28" - opendaylight: "opendaylight" opstools: "centos-release-opstools" rabbitmq: "rabbitmq_rabbitmq-server" td-agent: "treasuredata" -# TODO(mgoddard): Remove this when CentOS 7 support is no longer present. centos-aarch64: ceph: "centos-ceph-nautilus" elasticsearch: "elasticsearch-kibana-logstash-6.x" epel: "epel" + epel-modular: "epel-modular" erlang: "rabbitmq_rabbitmq-erlang" extras: "extras" grafana: "grafana" + hacluster: "HighAvailability" nfs-ganesha: "centos-nfs-ganesha28" - opendaylight: "opendaylight" opstools: "centos-release-opstools" rabbitmq: "rabbitmq_rabbitmq-server" -# TODO(mgoddard): Remove this when CentOS 7 support is no longer present. centos-ppc64le: ceph: "centos-ceph-nautilus" elasticsearch: "elasticsearch-kibana-logstash-6.x" epel: "epel" - extras: "extras" - nfs-ganesha: "centos-nfs-ganesha28" - opstools: "centos-release-opstools" - rabbitmq: "rabbitmq_rabbitmq-server" - -# TODO(mnasiadka): Rework the repo list once Ceph Octopus is released -centos8: - ceph: "centos-ceph-nautilus" epel-modular: "epel-modular" - epel: "epel" - erlang: "rabbitmq_rabbitmq-erlang" - grafana: "grafana" + extras: "extras" hacluster: "HighAvailability" - influxdb: "influxdb" nfs-ganesha: "centos-nfs-ganesha28" + opstools: "centos-release-opstools" rabbitmq: "rabbitmq_rabbitmq-server" - td-agent: "treasuredata" # NOTE(hrw): empty dict to avoid TypeError rhel: {} |