aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2022-09-27 10:18:01 +0000
committerMichal Nasiadka <mnasiadka@gmail.com>2022-09-30 14:17:34 +0000
commit0883532434fff341c444d8fce8e28fcff3f5e769 (patch)
tree7f1f75d1db104fb73451f086f7d0fd8b49c5bab1 /kolla
parent237013960425e4ff6cbc4814d4f9d61efcf601de (diff)
downloadkolla-0883532434fff341c444d8fce8e28fcff3f5e769.tar.gz
kolla-0883532434fff341c444d8fce8e28fcff3f5e769.zip
Add RockyLinux 9 support
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/859570 Change-Id: I7af51d07b8a939c908aa072294061def57dd67de
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/common/config.py4
-rwxr-xr-xkolla/image/build.py13
-rw-r--r--kolla/template/repos.yaml38
3 files changed, 53 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index d6b5e1e0f..06aa7a731 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -21,17 +21,19 @@ from kolla.common.users import USERS
from kolla.version import version_info as version
-BASE_OS_DISTRO = ['centos', 'debian', 'ubuntu']
+BASE_OS_DISTRO = ['centos', 'debian', 'rocky', 'ubuntu']
BASE_ARCH = ['x86_64', 'aarch64']
DEFAULT_BASE_TAGS = {
'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'},
'debian': {'name': 'debian', 'tag': 'bullseye'},
+ 'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '9'},
'ubuntu': {'name': 'ubuntu', 'tag': '22.04'},
}
# NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
DISTRO_PRETTY_NAME = {
'centos': 'CentOS Stream 9',
'debian': 'Debian GNU/Linux 11 (bullseye)',
+ 'rocky': 'Rocky Linux 9.0 (Blue Onyx)',
'ubuntu': 'Ubuntu 22.04',
}
OPENSTACK_RELEASE = 'master'
diff --git a/kolla/image/build.py b/kolla/image/build.py
index b0c828036..62a00a93f 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -104,6 +104,17 @@ UNBUILDABLE_IMAGES = {
'debian': {
},
+ 'rocky': {
+ "elasticsearch", # SHA1 gpg key
+ "hacluster-pcs", # Missing crmsh package
+ "kibana", # SHA1 gpg key
+ "logstash", # SHA1 gpg key
+ "nova-spicehtml5proxy", # Missing spicehtml5 package
+ "ovsdpdk", # Not supported on CentOS
+ "proxysql", # no binary package
+ "tgtd", # Not supported on CentOS
+ },
+
'ubuntu': {
"collectd", # Missing collectd-core package
"telegraf", # Missing collectd-core package
@@ -629,7 +640,7 @@ class KollaWorker(object):
conf.rpm_setup_config if repo_file is not None])
self.rpm_setup = self.build_rpm_setup(rpm_setup_config)
- if self.base in ['centos']:
+ if self.base in ['centos', 'rocky']:
self.conf.distro_python_version = "3.9"
self.distro_package_manager = 'dnf'
self.base_package_type = 'rpm'
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 867090c4b..e3a628599 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -135,6 +135,44 @@ debian-aarch64:
component: ""
gpg_key: "proxysql.asc"
+rocky:
+ ceph: "centos-ceph-quincy"
+ crb: "crb"
+ elasticsearch: "elasticsearch-kibana-logstash-7.x"
+ epel: "epel"
+ erlang: "rabbitmq_rabbitmq-erlang"
+ extras: "extras"
+ grafana: "grafana"
+ hacluster: "highavailability"
+ influxdb: "influxdb"
+ kibana: "elasticsearch-kibana-logstash-7.x"
+ logstash: "elasticsearch-kibana-logstash-7.x"
+ mariadb: "mariadb"
+ openvswitch: "centos-nfv-openvswitch"
+ opstools: "centos-opstools"
+ proxysql: "proxysql"
+ rabbitmq: "rabbitmq_rabbitmq-server"
+ td-agent: "treasuredata"
+
+rocky-aarch64:
+ ceph: "centos-ceph-quincy"
+ crb: "crb"
+ elasticsearch: "elasticsearch-kibana-logstash-7.x"
+ epel: "epel"
+ erlang: "centos-rabbitmq-38"
+ extras: "extras"
+ grafana: "grafana"
+ influxdb: "influxdb"
+ hacluster: "highavailability"
+ kibana: "elasticsearch-kibana-logstash-7.x"
+ logstash: "elasticsearch-kibana-logstash-7.x"
+ mariadb: "mariadb"
+ openvswitch: "centos-nfv-openvswitch"
+ opstools: "centos-opstools"
+ proxysql: "proxysql"
+ rabbitmq: "rabbitmq_rabbitmq-server"
+ td-agent: "treasuredata"
+
ubuntu:
elasticsearch:
url: "https://artifacts.elastic.co/packages/oss-7.x/apt"