diff --git a/ambari-common/src/main/python/ambari_commons/os_check.py b/ambari-common/src/main/python/ambari_commons/os_check.py index 44fce317b5f..2770f37cc2e 100644 --- a/ambari-common/src/main/python/ambari_commons/os_check.py +++ b/ambari-common/src/main/python/ambari_commons/os_check.py @@ -248,6 +248,8 @@ def _get_os_type(): operatingSystem = 'sles' elif operatingSystem.startswith('red hat enterprise linux'): operatingSystem = 'redhat' + elif operatingSystem.startswith('rocky linux'): + operatingSystem = 'redhat' elif operatingSystem.startswith('darwin'): operatingSystem = 'mac' diff --git a/ambari-common/src/main/python/ambari_commons/resources/os_family.json b/ambari-common/src/main/python/ambari_commons/resources/os_family.json index 0634988657e..2409e2cbc52 100644 --- a/ambari-common/src/main/python/ambari_commons/resources/os_family.json +++ b/ambari-common/src/main/python/ambari_commons/resources/os_family.json @@ -18,7 +18,8 @@ ], "versions": [ 6, - 7 + 7, + 8 ] }, "redhat-ppc": { diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml index 66c444d1144..df7d4a02faa 100755 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml @@ -146,7 +146,7 @@ - redhat7,amazonlinux2,redhat6,suse11,suse12 + redhat7,redhat8 ambari-infra-solr-client diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml index 6890e433fd3..4f0c3eed1c2 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml @@ -143,7 +143,7 @@ - redhat7,amazonlinux2,redhat6,suse11,suse12 + redhat7,redhat8 ambari-metrics-collector diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml index 91eb35c3013..f172172ec72 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml @@ -23,4 +23,11 @@ bigtop + + + https://bigtop-snapshot.s3.amazonaws.com/centos-8/$basearch + BIGTOP-3.2.0 + bigtop + + diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml index 2083651ea29..798d3f061f2 100755 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml @@ -105,7 +105,7 @@ - redhat7 + redhat7,redhat8 flink_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml index 36596f9230a..64a0fca15fd 100755 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml @@ -167,7 +167,7 @@ - redhat7 + redhat7,redhat8 hbase_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml index c849160dc06..d3fe89e3426 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml @@ -284,7 +284,7 @@ - redhat7 + redhat7,redhat8 hadoop_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml index b0b878b0fe8..bd655548a8c 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml @@ -281,7 +281,7 @@ - redhat7 + redhat7,redhat8 hive_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml index a3d67e91cf3..6d24ab73c91 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml @@ -90,7 +90,7 @@ - redhat7 + redhat7,redhat8 kafka_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml index d35254ffe53..3155a030ac2 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml @@ -81,7 +81,7 @@ - redhat7,amazonlinux2,redhat6 + redhat7,redhat8 krb5-workstation diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml index f058b07b8f9..5ff3f4d6823 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml @@ -64,7 +64,7 @@ - redhat7 + redhat7,redhat8 solr_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml index ad44effc6e0..3c829f78118 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml @@ -204,7 +204,7 @@ - redhat7 + redhat7,redhat8 spark_${stack_version}-core diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml index a10ff93109d..dc0ce87ff4b 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml @@ -75,7 +75,7 @@ - redhat7 + redhat7,redhat8 tez_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml index 3f89b755c01..cffd444ae67 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml @@ -143,7 +143,7 @@ - redhat7 + redhat7,redhat8 hadoop_${stack_version}-yarn @@ -290,7 +290,7 @@ - redhat7 + redhat7,redhat8 hadoop_${stack_version}-mapreduce diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml index 54f4e495cc9..761f3574fe8 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml @@ -65,7 +65,7 @@ limitations under the License. - redhat7 + redhat7,redhat8 zeppelin_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml index 58f7b025950..d86cad0801a 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml @@ -72,7 +72,7 @@ - redhat7 + redhat7,redhat8 zookeeper_${stack_version} diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml index 3a665d9fa80..ef5da7f4b45 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml @@ -23,4 +23,11 @@ bigtop + + + https://bigtop-snapshot.s3.amazonaws.com/centos-8/$basearch + BIGTOP-3.2.0 + bigtop + + diff --git a/ambari-server/src/main/resources/version_definition.xsd b/ambari-server/src/main/resources/version_definition.xsd index c9332804d11..dcca5cd15e6 100644 --- a/ambari-server/src/main/resources/version_definition.xsd +++ b/ambari-server/src/main/resources/version_definition.xsd @@ -53,6 +53,7 @@ +