You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/02/08 12:41:48 UTC
ambari git commit: AMBARI-14953. Support Ambari Server/Agent and HDP
install on Amazon Linux. (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 0903f2e0f -> 3b518fafa
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/3b518faf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b518faf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b518faf
Branch: refs/heads/branch-2.2
Commit: 3b518fafa614e1e52fb331ccd96235f4dad84c8b
Parents: 0903f2e
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Feb 8 13:41:42 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Feb 8 13:41:42 2016 +0200
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 8 +++---
ambari-agent/conf/unix/install-helper.sh | 26 +++++++++++++++----
ambari-agent/pom.xml | 23 -----------------
.../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 +++---
ambari-server/conf/unix/ambari-env.sh | 1 +
ambari-server/conf/unix/install-helper.sh | 24 ++++++++++++++---
ambari-server/pom.xml | 12 ---------
ambari-server/sbin/ambari-server | 7 ++---
.../src/main/python/ambari_server/utils.py | 3 ++-
.../AMBARI_METRICS/0.1.0/metainfo.xml | 2 +-
.../KERBEROS/1.10.3-10/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.2/repos/repoinfo.xml | 12 +++++++++
.../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/FALCON/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/FLUME/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HBASE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/HIVE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/KAFKA/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/KNOX/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/PIG/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/RANGER/metainfo.xml | 2 +-
.../HDP/2.3/services/RANGER_KMS/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/SLIDER/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/SPARK/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/SQOOP/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/STORM/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/TEZ/metainfo.xml | 2 +-
.../stacks/HDP/2.3/services/YARN/metainfo.xml | 4 +--
.../HDP/2.3/services/ZOOKEEPER/metainfo.xml | 2 +-
.../resources/stacks/HDP/2.4/repos/repoinfo.xml | 12 +++++++++
.../HDP/2.4/services/ACCUMULO/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/ATLAS/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/FALCON/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/FLUME/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/HBASE/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/HDFS/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/HIVE/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/KAFKA/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/KNOX/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/OOZIE/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/PIG/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/RANGER/metainfo.xml | 2 +-
.../HDP/2.4/services/RANGER_KMS/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/SLIDER/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/SPARK/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/SQOOP/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/STORM/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/TEZ/metainfo.xml | 2 +-
.../stacks/HDP/2.4/services/YARN/metainfo.xml | 4 +--
.../HDP/2.4/services/ZOOKEEPER/metainfo.xml | 2 +-
58 files changed, 175 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-agent/conf/unix/ambari-agent
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index 50d13b1..ba0bb65 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/3b518faf/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 35c67fb..442ca1b 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(){
# setting ambari_commons shared resource
@@ -50,10 +49,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
@@ -61,6 +56,27 @@ do_install(){
chmod 777 /var/lib/ambari-agent/tmp
chmod 700 /var/lib/ambari-agent/data
+
+ # 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/3b518faf/ambari-agent/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 38f436e..876cc78 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -237,18 +237,6 @@
<directoryIncluded>false</directoryIncluded>
<sources>
<source>
- <location>../ambari-common/src/main/unix/ambari-python-wrap</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/var/lib/ambari-agent/</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <directoryIncluded>false</directoryIncluded>
- <sources>
- <source>
<location>conf/unix/ambari-sudo.sh</location>
</source>
</sources>
@@ -631,17 +619,6 @@
</mapper>
</data>
<data>
- <src>../ambari-common/src/main/unix/ambari-python-wrap</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/var/lib/ambari-agent</prefix>
- <user>root</user>
- <group>root</group>
- <filemode>755</filemode>
- </mapper>
- </data>
- <data>
<src>conf/unix/ambari-sudo.sh</src>
<type>file</type>
<mapper>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 904a23b..238c276 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/3b518faf/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/3b518faf/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/3b518faf/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/3b518faf/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/3b518faf/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/3b518faf/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 9dbb2b8..53f6c5e 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -29,7 +29,6 @@ JINJA_SERVER_DIR="/usr/lib/ambari-server/lib/ambari_jinja2"
SIMPLEJSON_SERVER_DIR="/usr/lib/ambari-server/lib/ambari_simplejson"
PYTHON_WRAPER_TARGET="/usr/bin/ambari-python-wrap"
-PYTHON_WRAPER_SOURCE="/var/lib/ambari-server/ambari-python-wrap"
do_install(){
# setting ambari_commons shared resource
@@ -49,9 +48,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
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index f129983..b292565 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -407,18 +407,6 @@
</sources>
</mapping>
<mapping>
- <directory>/var/lib/ambari-server/</directory>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <directoryIncluded>false</directoryIncluded>
- <sources>
- <source>
- <location>../ambari-common/src/main/unix/ambari-python-wrap</location>
- </source>
- </sources>
- </mapping>
- <mapping>
<directory>/etc/ambari-server/conf</directory>
<configuration>true</configuration>
<sources>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/sbin/ambari-server
----------------------------------------------------------------------
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index 47e2926..72d94ed 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/3b518faf/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 2afcd1b..e7cdb7b 100644
--- a/ambari-server/src/main/python/ambari_server/utils.py
+++ b/ambari-server/src/main/python/ambari_server/utils.py
@@ -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/3b518faf/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/3b518faf/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 72f159a..c1d4db7 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/3b518faf/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..c5f6c40 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.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.2.6.0</baseurl>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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/3b518faf/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 352341b..febfa37 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_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 fee10d3..f5e741c 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_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
index 6fdad8b..1d1e3e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.6.1.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>falcon_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml
index 5031f85..a5892e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FLUME/metainfo.xml
@@ -24,7 +24,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>flume_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
index 90a31f5..ff55ee7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metainfo.xml
@@ -38,7 +38,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hbase_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 ca69195..306ca6a 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
@@ -57,7 +57,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 0756a54..f8c0cff 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
@@ -33,7 +33,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hive_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml
index 330b542..0ffe982 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.9.0.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>kafka_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml
index d1172b1..c39c559 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.6.0.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>knox_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 ccf5de3..20a46b4 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
@@ -38,7 +38,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11</osFamily>
<packages>
<package>
<name>oozie_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 8ba2426..59782bb 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_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml
index 2fb8a9a..78c6f30 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/metainfo.xml
@@ -29,7 +29,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>ranger_2_3_*-admin</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 5606a26..fc4a488 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_2_3_*-kms</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml
index 8287b50..4b8f522 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SLIDER/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.80.0.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>slider_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
index 2c9680c..39fb5e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SPARK/metainfo.xml
@@ -27,7 +27,7 @@
<extends>common-services/SPARK/1.4.1.2.3</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>spark_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml
index 1290cde..68e1f3b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/SQOOP/metainfo.xml
@@ -32,7 +32,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>sqoop_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
index 00af620..31291f9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/metainfo.xml
@@ -24,7 +24,7 @@
<version>0.10.0</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>storm_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml
index 7720a3d..95dae9b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/metainfo.xml
@@ -24,7 +24,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>tez_2_3_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml
index 5a21200..1cb0e9f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/metainfo.xml
@@ -25,7 +25,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_2_3_*-yarn</name>
@@ -57,7 +57,7 @@
<version>2.7.1.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_2_3_*-mapreduce</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/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 1f77215..53569e2 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>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/3b518faf/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..5afc35b 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="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://s3.amazonaws.com/dev.hortonworks.com/HDP/suse11sp3/2.x/updates/2.4.0.0</baseurl>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/ACCUMULO/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ACCUMULO/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ACCUMULO/metainfo.xml
index 9e82a82..0e6dbff 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ACCUMULO/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ACCUMULO/metainfo.xml
@@ -33,7 +33,7 @@
</osSpecific>
</osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>accumulo_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/ATLAS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ATLAS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ATLAS/metainfo.xml
index 158ef8c..7ff548e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ATLAS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ATLAS/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.5.0.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>atlas-metadata_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/FALCON/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/FALCON/metainfo.xml
index 183d55c..863b081 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/FALCON/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/FALCON/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.6.1.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>falcon_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/FLUME/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/FLUME/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/FLUME/metainfo.xml
index b7cd3d1..cd3ccfd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/FLUME/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/FLUME/metainfo.xml
@@ -24,7 +24,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>flume_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/HBASE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HBASE/metainfo.xml
index a1c2bd0..94b1887 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HBASE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HBASE/metainfo.xml
@@ -24,7 +24,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hbase_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml
index ce3fb95..401da18 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HDFS/metainfo.xml
@@ -33,7 +33,7 @@
</osSpecific>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
index 5ad52b6..c1d3e0f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/HIVE/metainfo.xml
@@ -33,7 +33,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hive_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml
index 90bc472..82338a3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KAFKA/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.9.0.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>kafka_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml
index e465d42..c6d38e2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/KNOX/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.6.0.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>knox_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml
index 2f09e88..927fc31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/OOZIE/metainfo.xml
@@ -39,7 +39,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
+ <osFamily>redhat5,amazon2015,redhat6,redhat7,suse11</osFamily>
<packages>
<package>
<name>oozie_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml
index 9ae1f42..aec3839 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/PIG/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.15.0.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>pig_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml
index d76ad5c..b1ddbcd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER/metainfo.xml
@@ -27,7 +27,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>ranger_2_4_*-admin</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml
index a27bf31..2654fd9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/RANGER_KMS/metainfo.xml
@@ -27,7 +27,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>ranger_2_4_*-kms</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml
index ff998f0..c883bc2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SLIDER/metainfo.xml
@@ -23,7 +23,7 @@
<version>0.80.0.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>slider_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
index 13c6a9b..562c977 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/metainfo.xml
@@ -40,7 +40,7 @@
</requiredServices>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>spark_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml
index 721cc33..8caabd4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SQOOP/metainfo.xml
@@ -32,7 +32,7 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>sqoop_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml
index 36b01e4..6ce698b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/STORM/metainfo.xml
@@ -24,7 +24,7 @@
<version>0.10.0.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>storm_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml
index 356225e..a92214c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/TEZ/metainfo.xml
@@ -24,7 +24,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>tez_2_4_*</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml
index c61a270..7979b9f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/YARN/metainfo.xml
@@ -25,7 +25,7 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_2_4_*-yarn</name>
@@ -57,7 +57,7 @@
<version>2.7.1.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>hadoop_2_4_*-mapreduce</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b518faf/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
index 4bf4198..1ced6dc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
@@ -23,7 +23,7 @@
<version>3.4.6.2.4</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat7,amazon2015,redhat6,suse11</osFamily>
<packages>
<package>
<name>zookeeper_2_4_*</name>