This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2e4cbb3e3c AMBARI-26126: Add openEuler-22.03 support (#3822)
2e4cbb3e3c is described below
commit 2e4cbb3e3cb5c1d0069ce227d577acadd0ad8b95
Author: timyuer <[email protected]>
AuthorDate: Sat Sep 7 17:55:23 2024 +0800
AMBARI-26126: Add openEuler-22.03 support (#3822)
---
.../src/main/python/ambari_commons/resources/os_family.json | 9 +++++++++
.../common-services/AMBARI_INFRA_SOLR/3.0.0/metainfo.xml | 2 +-
.../resources/common-services/AMBARI_METRICS/3.0.0/metainfo.xml | 2 +-
.../src/main/resources/stacks/BIGTOP/3.2.0/repos/repoinfo.xml | 7 +++++++
.../resources/stacks/BIGTOP/3.2.0/services/FLINK/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/HBASE/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/HDFS/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/HIVE/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/KAFKA/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/KERBEROS/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/SOLR/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/SPARK/metainfo.xml | 2 +-
.../main/resources/stacks/BIGTOP/3.2.0/services/TEZ/metainfo.xml | 2 +-
.../resources/stacks/BIGTOP/3.2.0/services/YARN/metainfo.xml | 4 ++--
.../resources/stacks/BIGTOP/3.2.0/services/ZEPPELIN/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.2.0/services/ZOOKEEPER/metainfo.xml | 2 +-
.../src/main/resources/stacks/BIGTOP/3.3.0/repos/repoinfo.xml | 9 ++++++++-
.../resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml | 2 +-
.../stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml | 2 +-
ambari-server/src/main/resources/version_definition.xsd | 1 +
21 files changed, 43 insertions(+), 19 deletions(-)
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 2409e2cbc5..6c83ca570c 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
@@ -33,6 +33,15 @@
7
]
},
+ "openeuler": {
+ "extends" : "redhat",
+ "distro": [
+ "openeuler"
+ ],
+ "versions": [
+ 22
+ ]
+ },
"amazonlinux": {
"extends" : "redhat",
"distro": [
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 df7d4a02fa..d615712707 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>ambari-infra-solr-client</name>
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 4f0c3eed1c..06a8e0716d 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>ambari-metrics-collector</name>
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 f172172ec7..f2a127beff 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
@@ -30,4 +30,11 @@
<reponame>bigtop</reponame>
</repo>
</os>
+ <os family="openeuler22">
+ <repo>
+
<baseurl>https://bigtop-snapshot.s3.amazonaws.com/openeuler-22/$basearch</baseurl>
+ <repoid>BIGTOP-3.2.0</repoid>
+ <reponame>bigtop</reponame>
+ </repo>
+ </os>
</reposinfo>
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 798d3f061f..88536c613e 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>flink_${stack_version}</name>
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 45a6f3af0d..a74df17bf0 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>hbase_${stack_version}</name>
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 fb70b2a6d1..172a0f031b 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
@@ -330,7 +330,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}</name>
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 7730115812..7d1aaef17e 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>hive_${stack_version}</name>
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 4a8e097d2d..d3031c7856 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
@@ -94,7 +94,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>kafka_${stack_version}</name>
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 3155a030ac..9a3c015a26 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>krb5-workstation</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
index fece912b2c..ff8359afd6 100644
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.2.0/services/LIVY/metainfo.xml
@@ -97,7 +97,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7</osFamily>
+ <osFamily>redhat7,openeuler22</osFamily>
<packages>
<package>
<name>spark_${stack_version}-core</name>
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 57750d3937..4ea46644c9 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>solr_${stack_version}</name>
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 3c829f7811..d5ca3f0c6a 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>spark_${stack_version}-core</name>
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 dc0ce87ff4..764e2ce3b1 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>tez_${stack_version}</name>
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 cbfadc2028..a3ab15cd72 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
@@ -226,7 +226,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-yarn</name>
@@ -379,7 +379,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-mapreduce</name>
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 761f3574fe..81e6b7def2 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.
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>zeppelin_${stack_version}</name>
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 d86cad0801..aff74b2e68 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 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>zookeeper_${stack_version}</name>
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 ef5da7f4b4..db01d3c142 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
@@ -26,7 +26,14 @@
<os family="redhat8">
<repo>
<baseurl>https://bigtop-snapshot.s3.amazonaws.com/centos-8/$basearch</baseurl>
- <repoid>BIGTOP-3.2.0</repoid>
+ <repoid>BIGTOP-3.3.0</repoid>
+ <reponame>bigtop</reponame>
+ </repo>
+ </os>
+ <os family="openeuler22">
+ <repo>
+
<baseurl>https://bigtop-snapshot.s3.amazonaws.com/openeuler-22/$basearch</baseurl>
+ <repoid>BIGTOP-3.3.0</repoid>
<reponame>bigtop</reponame>
</repo>
</os>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
index c72573937d..2743a244e6 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER/metainfo.xml
@@ -144,7 +144,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat8</osFamily>
+ <osFamily>redhat7,redhat8,openeuler22</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-admin</name>
diff --git
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
index a60548a8d3..492723ab9e 100755
---
a/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BIGTOP/3.3.0/services/RANGER_KMS/metainfo.xml
@@ -60,7 +60,7 @@
<osSpecifics>
<osSpecific>
-
<osFamily>redhat9,redhat8,redhat7,amazonlinux2,redhat6,suse11,suse12</osFamily>
+
<osFamily>redhat9,redhat8,redhat7,amazonlinux2,redhat6,suse11,suse12,openeuler22</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-kms</name>
diff --git a/ambari-server/src/main/resources/version_definition.xsd
b/ambari-server/src/main/resources/version_definition.xsd
index dcca5cd15e..50261d99d3 100644
--- a/ambari-server/src/main/resources/version_definition.xsd
+++ b/ambari-server/src/main/resources/version_definition.xsd
@@ -66,6 +66,7 @@
<xs:enumeration value="suse11" />
<xs:enumeration value="suse12" />
<xs:enumeration value="amazonlinux2" />
+ <xs:enumeration value="openeuler22" />
</xs:restriction>
</xs:simpleType>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
