You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2016/04/12 17:52:53 UTC
ambari git commit: AMBARI-15827. Build and Test SLES 12 Ambari with
SLES 12 HDP builds.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk cf2c82959 -> 65369f908
AMBARI-15827. Build and Test SLES 12 Ambari with SLES 12 HDP builds.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65369f90
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65369f90
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65369f90
Branch: refs/heads/trunk
Commit: 65369f908e7ff084adda8c315526c42bc8526afe
Parents: cf2c829
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Tue Apr 12 18:52:01 2016 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Tue Apr 12 18:52:01 2016 +0300
----------------------------------------------------------------------
.../src/main/python/ambari_commons/resources/os_family.json | 3 ++-
ambari-server/conf/unix/ambari.properties | 2 ++
.../src/main/java/org/apache/ambari/server/state/Host.java | 2 +-
.../common-services/AMBARI_METRICS/0.1.0/metainfo.xml | 2 +-
.../main/resources/common-services/GANGLIA/3.5.0/metainfo.xml | 4 ++--
.../main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +-
.../resources/common-services/HIVE/0.12.0.2.0/metainfo.xml | 4 ++--
.../resources/common-services/KERBEROS/1.10.3-10/metainfo.xml | 2 +-
.../resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml | 6 +++---
.../main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml | 4 ++--
.../main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml | 4 ++--
.../resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml | 6 +++---
.../main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml | 4 ++--
.../main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml | 4 ++--
.../resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml | 2 +-
.../main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml | 6 +++---
.../resources/stacks/HDP/2.5/services/ZEPPELIN/metainfo.xml | 2 +-
ambari-server/src/main/resources/version_definition.xsd | 1 +
contrib/version-builder/version_builder.py | 2 +-
37 files changed, 51 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-common/src/main/python/ambari_commons/resources/os_family.json
----------------------------------------------------------------------
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 1558c1b..ecd32d8 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
@@ -48,7 +48,8 @@
"suse"
],
"versions": [
- 11
+ 11,
+ 12
]
},
"winsrv": {
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 8c91923..1830d18 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -116,3 +116,5 @@ views.http.x-xss-protection=1; mode=block
views.http.x-frame-options=SAMEORIGIN
mpacks.staging.path=$ROOT/var/lib/ambari-server/resources/mpacks
+
+security.server.disabled.ciphers=TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384|TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384|TLS_RSA_WITH_AES_256_CBC_SHA256|TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384|TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384|TLS_DHE_RSA_WITH_AES_256_CBC_SHA256|TLS_DHE_DSS_WITH_AES_256_CBC_SHA256|TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA|TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA|TLS_RSA_WITH_AES_256_CBC_SHA|TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA|TLS_ECDH_RSA_WITH_AES_256_CBC_SHA|TLS_DHE_RSA_WITH_AES_256_CBC_SHA|TLS_DHE_DSS_WITH_AES_256_CBC_SHA|TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256|TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256|TLS_RSA_WITH_AES_128_CBC_SHA256|TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256|TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256|TLS_DHE_RSA_WITH_AES_128_CBC_SHA256|TLS_DHE_DSS_WITH_AES_128_CBC_SHA256|TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA|TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA|TLS_RSA_WITH_AES_128_CBC_SHA|TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA|TLS_ECDH_RSA_WITH_AES_128_CBC_SHA|TLS_DHE_RSA_WITH_AES_128_CBC_SHA|TLS_DHE
_DSS_WITH_AES_128_CBC_SHA|TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA|TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA|TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA|TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA|SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA|SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA|TLS_EMPTY_RENEGOTIATION_INFO_SCSV|TLS_DH_anon_WITH_AES_256_CBC_SHA256|TLS_ECDH_anon_WITH_AES_256_CBC_SHA|TLS_DH_anon_WITH_AES_256_CBC_SHA|TLS_DH_anon_WITH_AES_128_CBC_SHA256|TLS_ECDH_anon_WITH_AES_128_CBC_SHA|TLS_DH_anon_WITH_AES_128_CBC_SHA|TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA|SSL_DH_anon_WITH_3DES_EDE_CBC_SHA|SSL_RSA_WITH_DES_CBC_SHA|SSL_DHE_RSA_WITH_DES_CBC_SHA|SSL_DHE_DSS_WITH_DES_CBC_SHA|SSL_DH_anon_WITH_DES_CBC_SHA|SSL_RSA_EXPORT_WITH_DES40_CBC_SHA|SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA|SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA|SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA|TLS_RSA_WITH_NULL_SHA256|TLS_ECDHE_ECDSA_WITH_NULL_SHA|TLS_ECDHE_RSA_WITH_NULL_SHA|SSL_RSA_WITH_NULL_SHA|TLS_ECDH_ECDSA_WITH_NULL_SHA|TLS_ECDH_RSA_WITH_NULL_SHA|TLS_ECDH_anon_WITH_NULL_
SHA|SSL_RSA_WITH_NULL_MD5|TLS_KRB5_WITH_3DES_EDE_CBC_SHA|TLS_KRB5_WITH_3DES_EDE_CBC_MD5|TLS_KRB5_WITH_DES_CBC_SHA|TLS_KRB5_WITH_DES_CBC_MD5|TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA|TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
index 9268255..fce2f91 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Host.java
@@ -172,7 +172,7 @@ public interface Host extends Comparable {
* redhat6: for centos6, rhel6, oraclelinux6 ..
* ubuntu12 : for ubuntu12
* suse11: for sles11, suse11 ..
- *
+ * suse12: for suse12, sles12 ..
* @return the osFamily
*/
String getOsFamily();
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
----------------------------------------------------------------------
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 ff8a4c3..aaba3e9 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
@@ -108,7 +108,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>ambari-metrics-collector</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/metainfo.xml
----------------------------------------------------------------------
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 7303b82..f830967 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
@@ -55,7 +55,7 @@
</components>
<osSpecifics>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>python-rrdtool-1.4.5</name>
@@ -101,7 +101,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>suse11</osFamily>
+ <osFamily>suse11,suse12</osFamily>
<packages>
<package>
<name>apache2</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metainfo.xml
----------------------------------------------------------------------
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 86b021d..df7bf05 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
@@ -207,7 +207,7 @@
</osSpecific>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>snappy</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml
----------------------------------------------------------------------
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 fae9556..c35c420 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
@@ -274,7 +274,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -308,7 +308,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>suse11</osFamily>
+ <osFamily>suse11,suse12</osFamily>
<packages>
<package>
<name>mysql-client</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/metainfo.xml
----------------------------------------------------------------------
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 d8e3106..7d50ba1 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
@@ -117,7 +117,7 @@
</osSpecific>
<osSpecific>
- <osFamily>suse11</osFamily>
+ <osFamily>suse11,suse12</osFamily>
<packages>
<package>
<name>krb5</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml
----------------------------------------------------------------------
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 ed45439..9e9e642 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
@@ -127,7 +127,7 @@
</osSpecific>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>extjs-2.2-1</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml
index 96fb6e8..dee25ff 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FALCON/metainfo.xml
@@ -24,7 +24,7 @@
<version>0.6.0.2.2</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>falcon_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml
index 2a798e1..0b35357 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/FLUME/metainfo.xml
@@ -26,7 +26,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>flume_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml
index 980c0b5..1e1f8c3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/metainfo.xml
@@ -25,7 +25,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>hbase_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
index cf1ce50..40e05ff 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/metainfo.xml
@@ -25,7 +25,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
index fae06b2..ab307ce 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
@@ -68,7 +68,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>amazon2015,redhat6,redhat7,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,redhat7,suse11,suse12</osFamily>
<packages>
<package>
<name>hive_${stack_version}</name>
@@ -82,7 +82,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -130,7 +130,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>suse11</osFamily>
+ <osFamily>suse11,suse12</osFamily>
<packages>
<package>
<name>mysql-client</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml
index 397d831..ba530e9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/metainfo.xml
@@ -23,7 +23,7 @@
<extends>common-services/KAFKA/0.8.1.2.2</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>kafka_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml
index 4caec43..437036f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml
@@ -23,7 +23,7 @@
<extends>common-services/KNOX/0.5.0.2.2</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>knox_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml
index 63b5b23..2c40e25 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/OOZIE/metainfo.xml
@@ -75,7 +75,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11,suse12</osFamily>
<packages>
<package>
<name>oozie_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml
index 04fefad..faf4c31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/PIG/metainfo.xml
@@ -24,7 +24,7 @@
<version>0.14.0.2.2</version>
<osSpecifics>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>pig_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml
index 0529aa6..0a4309e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/RANGER/metainfo.xml
@@ -32,7 +32,7 @@
</themes>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-admin</name>
@@ -70,4 +70,4 @@
</quickLinksConfigurations>
</service>
</services>
-</metainfo>
\ No newline at end of file
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
index 6f221c2..22f93fe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
@@ -23,7 +23,7 @@
<extends>common-services/SLIDER/0.60.0.2.2</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>slider_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml
index e18d048..c0b43c2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SPARK/metainfo.xml
@@ -27,7 +27,7 @@
<version>1.2.1.2.2</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>spark_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml
index 10f460a..6653670 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SQOOP/metainfo.xml
@@ -33,7 +33,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>sqoop_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml
index a5bcd7e..318116f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/metainfo.xml
@@ -31,7 +31,7 @@
</components>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>storm_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml
index f99d19f..95d6e2d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/metainfo.xml
@@ -25,7 +25,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>tez_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml
index 5e44ced..2ebc3d7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/metainfo.xml
@@ -33,7 +33,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-yarn</name>
@@ -73,7 +73,7 @@
<version>2.6.0.2.2</version>
<osSpecifics>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-mapreduce</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/metainfo.xml
----------------------------------------------------------------------
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 987d686..57b19df 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
@@ -24,7 +24,7 @@
<version>1.7.0.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>accumulo_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/ATLAS/metainfo.xml
----------------------------------------------------------------------
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 1ce2e49..0abb468 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
@@ -24,7 +24,7 @@
<version>0.5.0.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>atlas-metadata_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/metainfo.xml
----------------------------------------------------------------------
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 fdbb5bd..0ea7da9 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
@@ -56,7 +56,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/metainfo.xml
----------------------------------------------------------------------
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 6bee339..57ee0b8 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
@@ -34,7 +34,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>hive_${stack_version}</name>
@@ -52,7 +52,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -105,7 +105,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>suse11</osFamily>
+ <osFamily>suse11,suse12</osFamily>
<packages>
<package>
<name>mysql-client</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
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 c7203f8..bb26f12 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
@@ -46,7 +46,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11,suse12</osFamily>
<packages>
<package>
<name>oozie_${stack_version}</name>
@@ -77,4 +77,4 @@
</service>
</services>
-</metainfo>
\ No newline at end of file
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/PIG/metainfo.xml
----------------------------------------------------------------------
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 de786d5..5e5c5cf 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
@@ -23,7 +23,7 @@
<version>0.15.0.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>pig_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER_KMS/metainfo.xml
----------------------------------------------------------------------
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 1384842..5804f88 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
@@ -26,7 +26,7 @@
<extends>common-services/RANGER_KMS/0.5.0.2.3</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-kms</name>
@@ -52,4 +52,4 @@
</service>
</services>
-</metainfo>
\ No newline at end of file
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
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 0219da8..13dcbdb 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
@@ -23,7 +23,7 @@
<version>3.4.6.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>zookeeper_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
index 85f0eb6..63ef567 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HIVE/metainfo.xml
@@ -134,7 +134,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>hive_${stack_version}</name>
@@ -158,7 +158,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>amazon2015,redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -217,7 +217,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>suse11</osFamily>
+ <osFamily>suse11,suse12</osFamily>
<packages>
<package>
<name>mysql-client</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/metainfo.xml
index 92e9401..d4e9e3a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ZEPPELIN/metainfo.xml
@@ -25,7 +25,7 @@
<extends>common-services/ZEPPELIN/0.6.0.2.5</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11,suse12</osFamily>
<packages>
<package>
<name>zeppelin_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/ambari-server/src/main/resources/version_definition.xsd
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/version_definition.xsd b/ambari-server/src/main/resources/version_definition.xsd
index d437906..b6360ee 100644
--- a/ambari-server/src/main/resources/version_definition.xsd
+++ b/ambari-server/src/main/resources/version_definition.xsd
@@ -54,6 +54,7 @@
<xs:enumeration value="ubuntu12" />
<xs:enumeration value="ubuntu14" />
<xs:enumeration value="suse11" />
+ <xs:enumeration value="suse12" />
</xs:restriction>
</xs:simpleType>
http://git-wip-us.apache.org/repos/asf/ambari/blob/65369f90/contrib/version-builder/version_builder.py
----------------------------------------------------------------------
diff --git a/contrib/version-builder/version_builder.py b/contrib/version-builder/version_builder.py
index 5d101be..965d80a 100644
--- a/contrib/version-builder/version_builder.py
+++ b/contrib/version-builder/version_builder.py
@@ -369,7 +369,7 @@ def main(argv):
parser.add_option('--repo', action='store_true', dest='repo',
help="Add repository data with options: --repo-os, --repo-url, --repo-id, --repo-name")
parser.add_option('--repo-os', dest='repo_os',
- help="The operating system type: i.e. redhat6, redhat7, debian7, ubuntu12, ubuntu14, suse11")
+ help="The operating system type: i.e. redhat6, redhat7, debian7, ubuntu12, ubuntu14, suse11, suse12")
parser.add_option('--repo-url', dest='repo_url',
help="The base url for the repository data")
parser.add_option('--repo-id', dest='repo_id', help="The ID of the repo")