You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/08 15:03:27 UTC
[07/12] ambari git commit: AMBARI-14953. Support Ambari Server/Agent
and HDP install on Amazon Linux. (aonishuk)
AMBARI-14953. Support Ambari Server/Agent and HDP install on Amazon Linux. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/268ae5b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/268ae5b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/268ae5b6
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 268ae5b62681f5f41b18da4164d570bd6690d411
Parents: 74eb20a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Feb 8 14:18:57 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Feb 8 14:18:57 2016 +0200
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 8 +++---
ambari-agent/conf/unix/install-helper.sh | 26 +++++++++++++++----
ambari-agent/src/packages/tarball/all.xml | 5 ----
.../src/main/python/ambari_commons/os_check.py | 27 +++++++++++++++++---
.../ambari_commons/resources/os_family.json | 10 +++++++-
.../core/providers/__init__.py | 3 +++
.../libraries/providers/__init__.py | 3 +++
ambari-common/src/main/unix/ambari-python-wrap | 8 +++---
.../HDP/2.0.1/services/GANGLIA/metainfo.xml | 4 +--
.../stacks/HDP/2.0.1/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.0.1/services/HIVE/metainfo.xml | 4 +--
.../HDP/2.0.1/services/OOZIE/metainfo.xml | 2 +-
.../HDP/2.0.5/services/GANGLIA/metainfo.xml | 4 +--
.../stacks/HDP/2.0.5/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.0.5/services/HIVE/metainfo.xml | 4 +--
.../HDP/2.0.5/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.0.7/services/HIVE/metainfo.xml | 4 +--
.../2.1.1/services/AMBARI_METRICS/metainfo.xml | 2 +-
ambari-server/conf/unix/ambari-env.sh | 1 +
ambari-server/conf/unix/install-helper.sh | 24 ++++++++++++++---
ambari-server/sbin/ambari-server | 7 ++---
ambari-server/src/main/assemblies/server.xml | 5 ----
.../src/main/python/ambari_server/utils.py | 5 ++--
.../AMBARI_METRICS/0.1.0/metainfo.xml | 2 +-
.../common-services/GANGLIA/3.5.0/metainfo.xml | 4 +--
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 2 +-
.../HIVE/0.12.0.2.0/metainfo.xml | 4 +--
.../KERBEROS/1.10.3-10/metainfo.xml | 2 +-
.../OOZIE/4.0.0.2.0/metainfo.xml | 2 +-
.../stacks/HDP/2.1/services/HIVE/metainfo.xml | 4 +--
.../stacks/HDP/2.1/services/OOZIE/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.2/repos/repoinfo.xml | 12 +++++++++
.../stacks/HDP/2.2/services/FALCON/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/FLUME/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/HBASE/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/HIVE/metainfo.xml | 6 ++---
.../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/KNOX/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/PIG/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/RANGER/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/SPARK/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/STORM/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/TEZ/metainfo.xml | 2 +-
.../stacks/HDP/2.2/services/YARN/metainfo.xml | 4 +--
.../HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.3/repos/repoinfo.xml | 12 +++++++++
.../HDP/2.3/services/ACCUMULO/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/ATLAS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HIVE/metainfo.xml | 6 ++---
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/PIG/metainfo.xml | 2 +-
.../HDP/2.3/services/RANGER_KMS/metainfo.xml | 2 +-
.../HDP/2.3/services/ZOOKEEPER/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.4/repos/repoinfo.xml | 12 +++++++++
59 files changed, 188 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-agent/conf/unix/ambari-agent
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index 96ef12b..f5ce304 100755
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -40,7 +40,7 @@ export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
export PYTHONPATH=/usr/lib/python2.6/site-packages:$PYTHONPATH
AMBARI_AGENT=ambari-agent
-PYTHON_WRAP=/var/lib/ambari-agent/ambari-python-wrap
+PYTHON_WRAP=/usr/bin/ambari-python-wrap
PIDDIR=/var/run/ambari-agent
PIDFILE=$PIDDIR/$AMBARI_AGENT.pid
OUTFILE=/var/log/ambari-agent/ambari-agent.out
@@ -81,10 +81,10 @@ change_files_permissions() {
ambari-sudo.sh chown $current_user "/usr/lib/ambari-agent/"
}
-# fills $PYTHON
-. $PYTHON_WRAP -V 2>/dev/null
-export PYTHON=$PYTHON
+if [ -z "$PYTHON" ] ; then
+ export PYTHON=`readlink $PYTHON_WRAP`
+fi
# Trying to read the passphrase from an environment
if [ ! -z $AMBARI_PASSPHRASE ]; then
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-agent/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/install-helper.sh b/ambari-agent/conf/unix/install-helper.sh
index 91ae248..2495080 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -30,7 +30,6 @@ JINJA_AGENT_DIR="/usr/lib/ambari-agent/lib/ambari_jinja2"
SIMPLEJSON_AGENT_DIR="/usr/lib/ambari-agent/lib/ambari_simplejson"
PYTHON_WRAPER_TARGET="/usr/bin/ambari-python-wrap"
-PYTHON_WRAPER_SOURCE="/var/lib/ambari-agent/ambari-python-wrap"
do_install(){
if [ -d "/etc/ambari-agent/conf.save" ]; then
@@ -55,10 +54,6 @@ do_install(){
if [ ! -d "$SIMPLEJSON_DIR" ]; then
ln -s "$SIMPLEJSON_AGENT_DIR" "$SIMPLEJSON_DIR"
fi
- # setting python-wrapper script
- if [ ! -f "$PYTHON_WRAPER_TARGET" ]; then
- ln -s "$PYTHON_WRAPER_SOURCE" "$PYTHON_WRAPER_TARGET"
- fi
# on nano Ubuntu, when umask=027 those folders are created without 'x' bit for 'others'.
# which causes failures when hadoop users try to access tmp_dir
@@ -85,6 +80,27 @@ do_install(){
fi
mv $BAK ${BAK}_$(date '+%d_%m_%y_%H_%M').save
fi
+
+ # remove old python wrapper
+ rm -f "$PYTHON_WRAPER_TARGET"
+
+ AMBARI_PYTHON=""
+ python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", "/usr/bin/python2.6" )
+ for python_binary in "${python_binaries[@]}"
+ do
+ $python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver >= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null
+
+ if [ $? -eq 0 ] ; then
+ AMBARI_PYTHON="$python_binary"
+ break;
+ fi
+ done
+
+ if [ -z "$AMBARI_PYTHON" ] ; then
+ >&2 echo "Cannot detect python for ambari to use. Please manually set $PYTHON_WRAPER link to point to correct python binary"
+ else
+ ln -s "$AMBARI_PYTHON" "$PYTHON_WRAPER_TARGET"
+ fi
}
do_remove(){
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-agent/src/packages/tarball/all.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/src/packages/tarball/all.xml b/ambari-agent/src/packages/tarball/all.xml
index d9732cc..c481208 100644
--- a/ambari-agent/src/packages/tarball/all.xml
+++ b/ambari-agent/src/packages/tarball/all.xml
@@ -141,11 +141,6 @@
<files>
<file>
<fileMode>755</fileMode>
- <source>../ambari-common/src/main/unix/ambari-python-wrap</source>
- <outputDirectory>/var/lib/ambari-agent/</outputDirectory>
- </file>
- <file>
- <fileMode>755</fileMode>
<source>conf/unix/ambari-sudo.sh</source>
<outputDirectory>/var/lib/ambari-agent/</outputDirectory>
</file>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-common/src/main/python/ambari_commons/os_check.py
----------------------------------------------------------------------
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 9751570..c5457bb 100644
--- a/ambari-common/src/main/python/ambari_commons/os_check.py
+++ b/ambari-common/src/main/python/ambari_commons/os_check.py
@@ -18,6 +18,7 @@ See the License for the specific language governing permissions and
limitations under the License.
'''
+import re
import os
import sys
import platform
@@ -81,6 +82,21 @@ def _is_oracle_linux():
def _is_redhat_linux():
return _IS_REDHAT_LINUX
+def advanced_check(distribution):
+ distribution = list(distribution)
+ if os.path.exists("/etc/issue"):
+ with open("/etc/issue", "rb") as fp:
+ issue_content = fp.read()
+
+ if "Amazon" in issue_content:
+ distribution[0] = "amazon"
+ search_groups = re.search('(\d+)\.(\d+)', issue_content)
+
+ if search_groups:
+ distribution[1] = search_groups.group(1) # if version is 2015.09 only get 2015.
+
+ return tuple(distribution)
+
class OS_CONST_TYPE(type):
@@ -167,10 +183,15 @@ class OSCheck:
distribution = platform.dist()
else:
distribution = platform.linux_distribution()
+
+
- if distribution[0] == '' and platform.system().lower() == 'darwin':
- # mac - used for unit tests
- distribution = ("Darwin", "TestOnly", "1.1.1", "1.1.1", "1.1")
+ if distribution[0] == '':
+ distribution = advanced_check(distribution)
+
+ if platform.system().lower() == 'darwin':
+ # mac - used for unit tests
+ distribution = ("Darwin", "TestOnly", "1.1.1", "1.1.1", "1.1")
return distribution
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 c0acc2c..13014fc 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
@@ -6,7 +6,6 @@
"centos",
"oraclelinux",
"ascendos",
- "amazon",
"xenserver",
"oel",
"ovs",
@@ -21,6 +20,15 @@
7
]
},
+ "amazon": {
+ "extends" : "redhat",
+ "distro": [
+ "amazon"
+ ],
+ "versions": [
+ 2015
+ ]
+ },
"debian": {
"extends" : "ubuntu",
"distro": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-common/src/main/python/resource_management/core/providers/__init__.py
----------------------------------------------------------------------
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 abb51c3..21ae0d5 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
@@ -41,6 +41,9 @@ class Provider(object):
PROVIDERS = dict(
+ amazon=dict(
+ Package="resource_management.core.providers.package.yumrpm.YumProvider",
+ ),
redhat=dict(
Package="resource_management.core.providers.package.yumrpm.YumProvider",
),
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-common/src/main/python/resource_management/libraries/providers/__init__.py
----------------------------------------------------------------------
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 44e9ca1..bd7c98a 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
@@ -21,6 +21,9 @@ Ambari Agent
"""
PROVIDERS = dict(
+ amazon=dict(
+ Repository="resource_management.libraries.providers.repository.RhelSuseRepositoryProvider",
+ ),
redhat=dict(
Repository="resource_management.libraries.providers.repository.RhelSuseRepositoryProvider",
),
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-common/src/main/unix/ambari-python-wrap
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/unix/ambari-python-wrap b/ambari-common/src/main/unix/ambari-python-wrap
index 8dab946..e94467c 100755
--- a/ambari-common/src/main/unix/ambari-python-wrap
+++ b/ambari-common/src/main/unix/ambari-python-wrap
@@ -24,14 +24,14 @@ if [ -a /usr/bin/python2 ] && [ -z "$PYTHON" ]; then
PYTHON=/usr/bin/python2
fi
-if [ -a /usr/bin/python2.6 ] && [ -z "$PYTHON" ]; then
- PYTHON=/usr/bin/python2.6
-fi
-
if [ -a /usr/bin/python2.7 ] && [ -z "$PYTHON" ]; then
PYTHON=/usr/bin/python2.7
fi
+if [ -a /usr/bin/python2.6 ] && [ -z "$PYTHON" ]; then
+ PYTHON=/usr/bin/python2.6
+fi
+
# if no preferable python versions found, try to use system one. Hoping it's Python 2
if [[ -z "$PYTHON" ]]; then
PYTHON=/usr/bin/python
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
index c183a15..ee9b1f2 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/GANGLIA/metainfo.xml
@@ -59,7 +59,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>libganglia-3.5.0-99</name>
@@ -113,7 +113,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6</osFamily>
<packages>
<package>
<name>httpd</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
index 660c956..93c4c6b 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HDFS/metainfo.xml
@@ -94,7 +94,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>snappy</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
index db6f863..ca50bb0 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml
@@ -115,7 +115,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -123,7 +123,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,ubuntu12</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,ubuntu12</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
index d76c7ed..50b0b71 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.1/services/OOZIE/metainfo.xml
@@ -102,7 +102,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>extjs-2.2-1</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
index 9167f87..d8d5263 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
@@ -60,7 +60,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>libganglia-3.5.0-99</name>
@@ -114,7 +114,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6</osFamily>
<packages>
<package>
<name>httpd</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
index 7c0dc74..d05d079 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HDFS/metainfo.xml
@@ -132,7 +132,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>snappy</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
index 35f77f8..9ada7eb 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/HIVE/metainfo.xml
@@ -220,7 +220,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -228,7 +228,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,ubuntu12</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,ubuntu12</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
index 6417dd4..27034d9 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
@@ -102,7 +102,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>extjs-2.2-1</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
index 35a4d05..f2ff12e 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/metainfo.xml
@@ -134,7 +134,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -142,7 +142,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,ubuntu12</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,ubuntu12</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
index 84735c2..be99b83 100644
--- a/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
+++ b/ambari-funtest/src/test/resources/stacks/HDP/2.1.1/services/AMBARI_METRICS/metainfo.xml
@@ -65,7 +65,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat5,redhat6,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>ambari-metrics-collector</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/conf/unix/ambari-env.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh
index e463ca6..bf7ae56 100644
--- a/ambari-server/conf/unix/ambari-env.sh
+++ b/ambari-server/conf/unix/ambari-env.sh
@@ -17,6 +17,7 @@
AMBARI_PASSHPHRASE="DEV"
export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m -Djava.security.auth.login.config=/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false'
export PATH=$PATH:/var/lib/ambari-server
+export PYTHONPATH=$PYTHONPATH:/usr/lib/python2.6/site-packages
# customize python binary for ambari
# export PYTHON=/usr/bin/python2
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/install-helper.sh b/ambari-server/conf/unix/install-helper.sh
index a1405e0..e2e22ab 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -32,7 +32,6 @@ JINJA_SERVER_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_jinja2"
SIMPLEJSON_SERVER_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_simplejson"
PYTHON_WRAPER_TARGET="${ROOT}/usr/bin/ambari-python-wrap"
-PYTHON_WRAPER_SOURCE="${ROOT}/var/lib/ambari-server/ambari-python-wrap"
AMBARI_SERVER_EXECUTABLE_LINK="${ROOT}/usr/sbin/ambari-server"
AMBARI_SERVER_EXECUTABLE="${ROOT}/etc/init.d/ambari-server"
@@ -62,9 +61,26 @@ do_install(){
if [ ! -d "$SIMPLEJSON_DIR" ]; then
ln -s "$SIMPLEJSON_SERVER_DIR" "$SIMPLEJSON_DIR"
fi
- # setting python-wrapper script
- if [ ! -f "$PYTHON_WRAPER_TARGET" ]; then
- ln -s "$PYTHON_WRAPER_SOURCE" "$PYTHON_WRAPER_TARGET"
+
+ # remove old python wrapper
+ rm -f "$PYTHON_WRAPER_TARGET"
+
+ AMBARI_PYTHON=""
+ python_binaries=( "/usr/bin/python" "/usr/bin/python2" "/usr/bin/python2.7", "/usr/bin/python2.6" )
+ for python_binary in "${python_binaries[@]}"
+ do
+ $python_binary -c "import sys ; ver = sys.version_info ; sys.exit(not (ver >= (2,6) and ver<(3,0)))" 1>/dev/null 2>/dev/null
+
+ if [ $? -eq 0 ] ; then
+ AMBARI_PYTHON="$python_binary"
+ break;
+ fi
+ done
+
+ if [ -z "$AMBARI_PYTHON" ] ; then
+ >&2 echo "Cannot detect python for ambari to use. Please manually set $PYTHON_WRAPER link to point to correct python binary"
+ else
+ ln -s "$AMBARI_PYTHON" "$PYTHON_WRAPER_TARGET"
fi
which chkconfig > /dev/null 2>&1
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/sbin/ambari-server
----------------------------------------------------------------------
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index da1a0eb..431ee5f 100755
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -37,10 +37,11 @@ esac
export PATH=/usr/lib/ambari-server/*:$PATH:/sbin/:/usr/sbin
export AMBARI_CONF_DIR=/etc/ambari-server/conf
-PYTHON_WRAP=/var/lib/ambari-server/ambari-python-wrap
+PYTHON_WRAP=/usr/bin/ambari-python-wrap
-# fills $PYTHON
-. $PYTHON_WRAP -V 2>/dev/null
+if [ -z "$PYTHON" ] ; then
+ export PYTHON=`readlink $PYTHON_WRAP`
+fi
if [ -a /var/lib/ambari-server/ambari-env.sh ]; then
. /var/lib/ambari-server/ambari-env.sh
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/assemblies/server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/assemblies/server.xml b/ambari-server/src/main/assemblies/server.xml
index 8bfad0c..ca74185 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -204,11 +204,6 @@
<outputDirectory>/etc/init.d</outputDirectory>
</file>
<file>
- <fileMode>755</fileMode>
- <source>../ambari-common/src/main/unix/ambari-python-wrap</source>
- <outputDirectory>/var/lib/ambari-server/</outputDirectory>
- </file>
- <file>
<source>${ambariProperties}</source>
<outputDirectory>/etc/ambari-server/conf</outputDirectory>
</file>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/python/ambari_server/utils.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/utils.py b/ambari-server/src/main/python/ambari_server/utils.py
index 98ced17..49af869 100644
--- a/ambari-server/src/main/python/ambari_server/utils.py
+++ b/ambari-server/src/main/python/ambari_server/utils.py
@@ -216,7 +216,7 @@ def get_postgre_hba_dir(OS_FAMILY):
# Like: /etc/postgresql/9.1/main/
return os.path.join(get_pg_hba_init_files(), get_ubuntu_pg_version(),
"main")
- elif OSCheck.is_redhat_family() and int(OSCheck.get_os_major_version()) >= 7:
+ elif not glob.glob(get_pg_hba_init_files() + '*'): # this happens when the service file is of new format (/usr/lib/systemd/system/postgresql.service)
return PG_HBA_ROOT_DEFAULT
else:
if not os.path.isfile(get_pg_hba_init_files()):
@@ -224,8 +224,9 @@ def get_postgre_hba_dir(OS_FAMILY):
os.symlink(glob.glob(get_pg_hba_init_files() + '*')[0],
get_pg_hba_init_files())
+ pg_hba_init_basename = os.path.basename(get_pg_hba_init_files())
# Get postgres_data location (default: /var/lib/pgsql/data)
- cmd = "alias exit=return; source " + get_pg_hba_init_files() + " status &>/dev/null; echo $PGDATA"
+ cmd = "alias basename='echo {0}; true' ; alias exit=return; source {1} status &>/dev/null; echo $PGDATA".format(pg_hba_init_basename, get_pg_hba_init_files())
p = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stdin=subprocess.PIPE,
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 6ea4ca5..c3dbc6b 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
@@ -78,7 +78,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>ambari-metrics-collector</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 42e9352..7303b82 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>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>python-rrdtool-1.4.5</name>
@@ -112,7 +112,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6</osFamily>
+ <osFamily>amazon2015,redhat6</osFamily>
<packages>
<package>
<name>httpd</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 752de0e..73616ae 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
@@ -171,7 +171,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>snappy</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 fc93ee6..dfa20a5 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
@@ -260,7 +260,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -269,7 +269,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,debian7,ubuntu12,ubuntu14</osFamily>
+ <osFamily>amazon2015,redhat6,debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 ec462a7..d8e3106 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
@@ -73,7 +73,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6</osFamily>
<packages>
<package>
<name>krb5-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 3939ef0..52fb4ac 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
@@ -121,7 +121,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>extjs-2.2-1</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
index 279bcb7..b80eeba 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml
@@ -63,7 +63,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -87,7 +87,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,ubuntu12</osFamily>
+ <osFamily>amazon2015,redhat6,ubuntu12</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
index bb6f146..7c4b232 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml
@@ -42,7 +42,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>extjs-2.2-1</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
index dbf8506..9decf51 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
@@ -29,6 +29,18 @@
<reponame>HDP-UTILS</reponame>
</repo>
</os>
+ <os family="amazon2015">
+ <repo>
+ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.2.6.0</baseurl>
+ <repoid>HDP-2.2</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl>
+ <repoid>HDP-UTILS-1.1.0.20</repoid>
+ <reponame>HDP-UTILS</reponame>
+ </repo>
+ </os>
<os family="suse11">
<repo>
<baseurl>http://public-repo-1.hortonworks.com/HDP/suse11sp3/2.x/updates/2.2.6.0</baseurl>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 77b593b..96fb6e8 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>falcon_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 48368ea..2a798e1 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>flume_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 e88f073..980c0b5 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hbase_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 0c98a72..cf1ce50 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>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 11921a6..fae06b2 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>redhat6,redhat7,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,redhat7,suse11</osFamily>
<packages>
<package>
<name>hive_${stack_version}</name>
@@ -82,7 +82,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -120,7 +120,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,ubuntu12</osFamily>
+ <osFamily>amazon2015,redhat6,ubuntu12</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 3268665..397d831 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>kafka_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 22b1be4..4caec43 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>knox_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 b5682e4..63b5b23 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,redhat6,redhat7,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11</osFamily>
<packages>
<package>
<name>oozie_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 c4b9c8b..04fefad 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>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>pig_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 b8edba5..d2bc6f0 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-admin</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 dfab0d7..6f221c2 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>slider_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 f370bf3..e18d048 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>spark_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 d408f38..10f460a 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>sqoop_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 eca29ae..a5bcd7e 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>storm_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 3f3a10c..f99d19f 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>tez_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 bb346f0..eeb71fb 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
@@ -32,7 +32,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-yarn</name>
@@ -72,7 +72,7 @@
<version>2.6.0.2.2</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}-mapreduce</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml
index c2fe742..4833857 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ZOOKEEPER/metainfo.xml
@@ -23,7 +23,7 @@
<version>3.4.6.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>zookeeper_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml
----------------------------------------------------------------------
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 142b87d..279134b 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
@@ -41,6 +41,18 @@
<reponame>HDP-UTILS</reponame>
</repo>
</os>
+ <os family="amazon2015">
+ <repo>
+ <baseurl>http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.3.0.0</baseurl>
+ <repoid>HDP-2.3</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl>
+ <repoid>HDP-UTILS-1.1.0.20</repoid>
+ <reponame>HDP-UTILS</reponame>
+ </repo>
+ </os>
<os family="suse11">
<repo>
<baseurl>http://public-repo-1.hortonworks.com/HDP/suse11sp3/2.x/updates/2.3.0.0</baseurl>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 de6983c..987d686 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>accumulo_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 4983698..1ce2e49 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>atlas-metadata_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 ac6ddaf..fdbb5bd 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 fcbb02e..6bee339 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hive_${stack_version}</name>
@@ -52,7 +52,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>mysql</name>
@@ -95,7 +95,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,debian7,ubuntu12,ubuntu14</osFamily>
+ <osFamily>amazon2015,redhat6,debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 9b324bb..c7203f8 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,redhat6,redhat7,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11</osFamily>
<packages>
<package>
<name>oozie_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 95830de..de786d5 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>pig_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 fdc9098..1384842 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,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>ranger_${stack_version}-kms</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/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 315f319..0219da8 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>redhat6,suse11</osFamily>
+ <osFamily>amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>zookeeper_${stack_version}</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/268ae5b6/ambari-server/src/main/resources/stacks/HDP/2.4/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/repos/repoinfo.xml
index 54bd3da..6ac43f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/repos/repoinfo.xml
@@ -41,6 +41,18 @@
<reponame>HDP-UTILS</reponame>
</repo>
</os>
+ <os family="redhat2015">
+ <repo>
+ <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.4.0.0</baseurl>
+ <repoid>HDP-2.4</repoid>
+ <reponame>HDP</reponame>
+ </repo>
+ <repo>
+ <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6</baseurl>
+ <repoid>HDP-UTILS-1.1.0.20</repoid>
+ <reponame>HDP-UTILS</reponame>
+ </repo>
+ </os>
<os family="suse11">
<repo>
<baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11sp3/2.x/updates/2.4.0.0</baseurl>