From 8545498cd57f16b9e49ce375632fa93ccbcc0aeb Mon Sep 17 00:00:00 2001 From: weidongxing Date: Mon, 9 Jan 2017 04:15:41 -0500 Subject: [PATCH 1/2] Supported Kylin4 OS --- .../main/python/ambari_commons/resources/os_family.json | 9 +++++++++ .../resource_management/core/providers/__init__.py | 3 +++ .../resource_management/libraries/providers/__init__.py | 3 +++ 3 files changed, 15 insertions(+) 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 c0acc2cb679..fbde4959fd6 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 @@ -30,6 +30,15 @@ 7 ] }, + "kylin": { + "extends" : "ubuntu", + "distro": [ + "kylin" + ], + "versions": [ + 4 + ] + }, "ubuntu": { "distro": [ "ubuntu" diff --git a/ambari-common/src/main/python/resource_management/core/providers/__init__.py b/ambari-common/src/main/python/resource_management/core/providers/__init__.py index abb51c31921..174592aa452 100644 --- a/ambari-common/src/main/python/resource_management/core/providers/__init__.py +++ b/ambari-common/src/main/python/resource_management/core/providers/__init__.py @@ -53,6 +53,9 @@ def __unicode__(self): debian=dict( Package="resource_management.core.providers.package.apt.AptProvider", ), + kylin=dict( + Package="resource_management.core.providers.package.apt.AptProvider", + ), winsrv=dict( Service="resource_management.core.providers.windows.service.ServiceProvider", ServiceConfig="resource_management.core.providers.windows.service.ServiceConfigProvider", diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/__init__.py b/ambari-common/src/main/python/resource_management/libraries/providers/__init__.py index 44e9ca14aed..4b367853010 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/__init__.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/__init__.py @@ -33,6 +33,9 @@ debian=dict( Repository="resource_management.libraries.providers.repository.UbuntuRepositoryProvider", ), + kylin=dict( + Repository="resource_management.libraries.providers.repository.UbuntuRepositoryProvider", + ), winsrv=dict( Msi="resource_management.libraries.providers.msi.MsiProvider" ), From 80a0e51e39cddf4d49196499901eeb0411044ab3 Mon Sep 17 00:00:00 2001 From: weidongxing Date: Mon, 9 Jan 2017 05:05:01 -0500 Subject: [PATCH 2/2] Added kylin4 osFamily to metainfo.xml and repoinfo.xml --- .../AMBARI_METRICS/0.1.0/metainfo.xml | 2 +- .../common-services/GANGLIA/3.5.0/metainfo.xml | 2 +- .../common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +- .../common-services/HIVE/0.12.0.2.0/metainfo.xml | 2 +- .../common-services/KERBEROS/1.10.3-10/metainfo.xml | 2 +- .../common-services/OOZIE/4.0.0.2.0/metainfo.xml | 2 +- .../resources/stacks/HDP/2.3/repos/repoinfo.xml | 13 +++++++++++++ .../stacks/HDP/2.3/services/ACCUMULO/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/ATLAS/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/FALCON/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/FLUME/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/HBASE/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/HIVE/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/KAFKA/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/KNOX/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 4 ++-- .../stacks/HDP/2.3/services/PIG/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/RANGER/metainfo.xml | 4 ++-- .../stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml | 4 ++-- .../stacks/HDP/2.3/services/SLIDER/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/SPARK/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/SQOOP/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/STORM/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/TEZ/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/YARN/metainfo.xml | 4 ++-- .../stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml | 2 +- 27 files changed, 43 insertions(+), 30 deletions(-) diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml index 48469df6ef4..edb7ccdfeb9 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml @@ -86,7 +86,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 ambari-metrics-assembly diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/metainfo.xml b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/metainfo.xml index 42e93522c08..3598637e228 100644 --- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/metainfo.xml @@ -81,7 +81,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 python-rrdtool diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml index e3e16e3a7e0..83080f9582c 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml @@ -193,7 +193,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 libsnappy1 diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml index 634b2fc016f..249b01f5329 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml @@ -268,7 +268,7 @@ - redhat6,debian7,ubuntu12,ubuntu14 + redhat6,kylin4,debian7,ubuntu12,ubuntu14 mysql-server diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/metainfo.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/metainfo.xml index 72f159ab999..4662adc8a61 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/metainfo.xml @@ -91,7 +91,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 krb5-kdc diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml index 3939ef0dd2f..69575b634a6 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml @@ -130,7 +130,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 extjs diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml index 142b87d858e..cd111935f9b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml @@ -77,6 +77,19 @@ HDP-UTILS + + + + http://public-repo-1.hortonworks.com/HDP/ubuntu14/2.x/updates/2.3.0.0 + HDP-2.3 + HDP + + + http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/ubuntu12 + HDP-UTILS-1.1.0.20 + HDP-UTILS + + http://public-repo-1.hortonworks.com/HDP/ubuntu14/2.x/updates/2.3.0.0 diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml index 352341ba84c..872ba016ab3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml @@ -32,7 +32,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 accumulo-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml index fee10d30436..6dfc2678500 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml @@ -32,7 +32,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 atlas-metadata-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml index 6fdad8b592c..e7505ddb766 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml @@ -31,7 +31,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 falcon-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml index 5031f85acdc..6c45f5dbe1f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml @@ -32,7 +32,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 flume-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml index 90a31f5d3ae..af0c1e1ef3b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml @@ -49,7 +49,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 hbase-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml index ca691952ef0..987ae067771 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml @@ -82,7 +82,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 hadoop-2-3-.*-client diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml index 0756a54bd1a..7d39dcd4299 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml @@ -72,7 +72,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 hive-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml index 330b542e266..ab7889adc1c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml @@ -31,7 +31,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 kafka-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml index d1172b13e42..e52e1cfd0a9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml @@ -31,7 +31,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 knox-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml index ccf5de3db07..035535d5dda 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml @@ -49,7 +49,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 oozie-2-3-.* @@ -69,4 +69,4 @@ - \ No newline at end of file + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml index 8ba2426a453..8df4bbfc1ae 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml @@ -34,7 +34,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 pig-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml index 2fb8a9a2db8..aa99a8ad2c2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml @@ -40,7 +40,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 ranger-2-3-.*-admin @@ -66,4 +66,4 @@ - \ No newline at end of file + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml index 5606a26b4ce..dbc9e1af528 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml @@ -34,7 +34,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 ranger-2-3-.*-kms @@ -52,4 +52,4 @@ - \ No newline at end of file + diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml index 8287b50cdf4..62bc5a8cf87 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml @@ -34,7 +34,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 slider-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml index 2c9680cb584..4be769193f1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml @@ -38,7 +38,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 spark-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml index 1290cde6e89..ed7ee4201a7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml @@ -40,7 +40,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 sqoop-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml index 00af620a6fc..adc200ed95d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml @@ -32,7 +32,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 storm-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml index 7720a3d78bc..ba9cf457d13 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml @@ -32,7 +32,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 tez-2-3-.* diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml index 5a21200a0ad..0ccacc9222e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml @@ -39,7 +39,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 hadoop-2-3-.*-yarn @@ -65,7 +65,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 hadoop-2-3-.*-mapreduce diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml index 1f772159803..381fdd0ab70 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml @@ -31,7 +31,7 @@ - debian7,ubuntu12,ubuntu14 + kylin4,debian7,ubuntu12,ubuntu14 zookeeper-2-3-.*