diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-30 20:13:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-30 20:13:03 +0000 |
| commit | e97239f03e734195a49b383f0e77aae3bdea9a35 (patch) | |
| tree | 6e642b2c4dc807e60d5b3ba84d0d5defa6b9a8ca /kolla/template | |
| parent | 63ad9cd0de0926f401a7f26bff505b1629f2e520 (diff) | |
| parent | 4b4e26262b9e03190c639481fb60a8f4f92c532a (diff) | |
| download | kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.tar.gz kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.zip | |
Merge "CentOS 8: Update packages in images"
Diffstat (limited to 'kolla/template')
| -rw-r--r-- | kolla/template/methods.py | 4 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 73e9d515a..66c5dcfa9 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -99,6 +99,10 @@ def handle_repos(context, reponames, mode): 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 = '' try: diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index c0e6cdfca..3d5ce7c69 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -1,4 +1,5 @@ --- +# TODO(mgoddard): Remove this when CentOS 7 support is no longer present. centos: ceph: "centos-ceph-nautilus" elasticsearch: "elasticsearch-kibana-logstash-5.x" @@ -14,6 +15,7 @@ centos: 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-5.x" @@ -25,6 +27,7 @@ centos-aarch64: 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-5.x" @@ -34,6 +37,12 @@ centos-ppc64le: opstools: "centos-release-opstools" rabbitmq: "rabbitmq_rabbitmq-server" +centos8: + grafana: "grafana" + influxdb: "influxdb" + rabbitmq: "rabbitmq_rabbitmq-server" + td-agent: "treasuredata" + # NOTE(hrw): empty dict to avoid TypeError rhel: {} |
