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 2015/12/23 16:06:41 UTC
[02/51] [abbrv] ambari git commit: AMBARI-14430. Get rid of wildcards
in package names. (aonishuk)
AMBARI-14430. Get rid of wildcards in package names. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ce4f544
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ce4f544
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ce4f544
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 5ce4f544807b733b12596b828d430017683a525b
Parents: 1901b39
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Dec 18 12:41:47 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Dec 18 12:41:47 2015 +0200
----------------------------------------------------------------------
.../core/providers/package/apt.py | 8 +-
.../core/providers/package/yumrpm.py | 8 +-
.../core/providers/package/zypper.py | 8 +-
.../libraries/functions/get_lzo_packages.py | 4 +-
.../libraries/functions/packages_analyzer.py | 9 ++
.../libraries/script/script.py | 39 ++++++++-
.../package/scripts/accumulo_service.py | 2 +-
.../custom_actions/scripts/install_packages.py | 38 ++-------
.../stacks/HDP/2.2/services/FALCON/metainfo.xml | 8 +-
.../stacks/HDP/2.2/services/FLUME/metainfo.xml | 9 +-
.../stacks/HDP/2.2/services/HBASE/metainfo.xml | 12 +--
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 39 +++++----
.../stacks/HDP/2.2/services/HIVE/metainfo.xml | 26 +++---
.../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 6 +-
.../stacks/HDP/2.2/services/KNOX/metainfo.xml | 6 +-
.../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 16 ++--
.../stacks/HDP/2.2/services/PIG/metainfo.xml | 4 +-
.../stacks/HDP/2.2/services/RANGER/metainfo.xml | 10 +--
.../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 10 +--
.../stacks/HDP/2.2/services/SPARK/metainfo.xml | 10 +--
.../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 8 +-
.../stacks/HDP/2.2/services/STORM/metainfo.xml | 8 +-
.../stacks/HDP/2.2/services/TEZ/metainfo.xml | 8 +-
.../stacks/HDP/2.2/services/YARN/metainfo.xml | 14 ++--
.../HDP/2.2/services/ZOOKEEPER/metainfo.xml | 25 ------
.../HDP/2.3/services/ACCUMULO/metainfo.xml | 4 +-
.../stacks/HDP/2.3/services/ATLAS/metainfo.xml | 4 +-
.../stacks/HDP/2.3/services/FALCON/metainfo.xml | 18 ----
.../stacks/HDP/2.3/services/FLUME/metainfo.xml | 20 -----
.../stacks/HDP/2.3/services/HBASE/metainfo.xml | 25 ------
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 71 ----------------
.../stacks/HDP/2.3/services/HIVE/metainfo.xml | 87 --------------------
.../stacks/HDP/2.3/services/KAFKA/metainfo.xml | 18 ----
.../stacks/HDP/2.3/services/KNOX/metainfo.xml | 18 ----
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 22 ++---
.../stacks/HDP/2.3/services/PIG/metainfo.xml | 8 +-
.../stacks/HDP/2.3/services/RANGER/metainfo.xml | 25 ------
.../HDP/2.3/services/RANGER_KMS/metainfo.xml | 4 +-
.../stacks/HDP/2.3/services/SLIDER/metainfo.xml | 24 ------
.../stacks/HDP/2.3/services/SPARK/metainfo.xml | 24 ------
.../stacks/HDP/2.3/services/SQOOP/metainfo.xml | 27 ------
.../stacks/HDP/2.3/services/STORM/metainfo.xml | 18 ----
.../stacks/HDP/2.3/services/TEZ/metainfo.xml | 20 -----
.../stacks/HDP/2.3/services/YARN/metainfo.xml | 46 -----------
.../HDP/2.3/services/ZOOKEEPER/metainfo.xml | 13 ++-
.../HDP/2.4/services/ACCUMULO/metainfo.xml | 29 -------
.../stacks/HDP/2.4/services/ATLAS/metainfo.xml | 18 ----
.../stacks/HDP/2.4/services/FALCON/metainfo.xml | 18 ----
.../stacks/HDP/2.4/services/FLUME/metainfo.xml | 20 -----
.../stacks/HDP/2.4/services/HBASE/metainfo.xml | 26 ------
.../stacks/HDP/2.4/services/HDFS/metainfo.xml | 73 ----------------
.../stacks/HDP/2.4/services/HIVE/metainfo.xml | 87 --------------------
.../stacks/HDP/2.4/services/KAFKA/metainfo.xml | 18 ----
.../stacks/HDP/2.4/services/KNOX/metainfo.xml | 18 ----
.../stacks/HDP/2.4/services/OOZIE/metainfo.xml | 44 ----------
.../stacks/HDP/2.4/services/PIG/metainfo.xml | 24 ------
.../stacks/HDP/2.4/services/RANGER/metainfo.xml | 26 ------
.../HDP/2.4/services/RANGER_KMS/metainfo.xml | 20 -----
.../stacks/HDP/2.4/services/SLIDER/metainfo.xml | 24 ------
.../stacks/HDP/2.4/services/SPARK/metainfo.xml | 24 ------
.../stacks/HDP/2.4/services/SQOOP/metainfo.xml | 27 ------
.../stacks/HDP/2.4/services/STORM/metainfo.xml | 19 -----
.../stacks/HDP/2.4/services/TEZ/metainfo.xml | 20 -----
.../stacks/HDP/2.4/services/YARN/metainfo.xml | 46 -----------
.../HDP/2.4/services/ZOOKEEPER/metainfo.xml | 25 ------
.../custom_actions/TestInstallPackages.py | 72 ++++++++--------
.../configs/install_packages_config.json | 4 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 13 ++-
68 files changed, 245 insertions(+), 1281 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
index 70a553d..ea8ad98 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
@@ -57,8 +57,8 @@ def replace_underscores(function_to_decorate):
class AptProvider(PackageProvider):
@replace_underscores
- def install_package(self, name, use_repos=[], skip_repos=[]):
- if use_repos or not self._check_existence(name):
+ def install_package(self, name, use_repos=[], skip_repos=[], is_upgrade=False):
+ if is_upgrade or use_repos or not self._check_existence(name):
cmd = INSTALL_CMD[self.get_logoutput()]
copied_sources_files = []
is_tmp_dir_created = False
@@ -109,8 +109,8 @@ class AptProvider(PackageProvider):
return "Unable to lock the administration directory" in out
@replace_underscores
- def upgrade_package(self, name, use_repos=[], skip_repos=[]):
- return self.install_package(name, use_repos, skip_repos)
+ def upgrade_package(self, name, use_repos=[], skip_repos=[], is_upgrade=True):
+ return self.install_package(name, use_repos, skip_repos, is_upgrade)
@replace_underscores
def remove_package(self, name):
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
index 87938ad..ea86395 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
@@ -37,8 +37,8 @@ REMOVE_CMD = {
}
class YumProvider(PackageProvider):
- def install_package(self, name, use_repos=[], skip_repos=[]):
- if use_repos or not self._check_existence(name):
+ def install_package(self, name, use_repos=[], skip_repos=[], is_upgrade=False):
+ if is_upgrade or use_repos or not self._check_existence(name):
cmd = INSTALL_CMD[self.get_logoutput()]
if use_repos:
enable_repo_option = '--enablerepo=' + ",".join(use_repos)
@@ -50,8 +50,8 @@ class YumProvider(PackageProvider):
else:
Logger.info("Skipping installation of existing package %s" % (name))
- def upgrade_package(self, name, use_repos=[], skip_repos=[]):
- return self.install_package(name, use_repos, skip_repos)
+ def upgrade_package(self, name, use_repos=[], skip_repos=[], is_upgrade=True):
+ return self.install_package(name, use_repos, skip_repos, is_upgrade)
def remove_package(self, name):
if self._check_existence(name):
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py b/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
index 1fbc9bf..d0f3198 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/package/zypper.py
@@ -38,8 +38,8 @@ REMOVE_CMD = {
LIST_ACTIVE_REPOS_CMD = ['/usr/bin/zypper', 'repos']
class ZypperProvider(PackageProvider):
- def install_package(self, name, use_repos=[], skip_repos=[]):
- if use_repos or not self._check_existence(name):
+ def install_package(self, name, use_repos=[], skip_repos=[], is_upgrade=False):
+ if is_upgrade or use_repos or not self._check_existence(name):
cmd = INSTALL_CMD[self.get_logoutput()]
if use_repos:
active_base_repos = self.get_active_base_repos()
@@ -58,8 +58,8 @@ class ZypperProvider(PackageProvider):
else:
Logger.info("Skipping installation of existing package %s" % (name))
- def upgrade_package(self, name, use_repos=[], skip_repos=[]):
- return self.install_package(name, use_repos, skip_repos)
+ def upgrade_package(self, name, use_repos=[], skip_repos=[], is_upgrade=True):
+ return self.install_package(name, use_repos, skip_repos, is_upgrade)
def remove_package(self, name):
if self._check_existence(name):
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py b/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
index 6dbcef5..0537ec3 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/get_lzo_packages.py
@@ -39,9 +39,9 @@ def get_lzo_packages(stack_version_unformatted):
if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0:
if OSCheck.is_redhat_family() or OSCheck.is_suse_family():
- lzo_packages += [format("hadooplzo_{underscored_version}_*")]
+ lzo_packages += [format("hadooplzo_*")]
elif OSCheck.is_ubuntu_family():
- lzo_packages += [format("hadooplzo_{dashed_version}_*")]
+ lzo_packages += [format("hadooplzo_*")]
else:
lzo_packages += ["hadoop-lzo"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py b/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py
index 7f34cc1..d4b48ef 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py
@@ -25,6 +25,7 @@ from threading import Thread
import threading
from ambari_commons import OSCheck, OSConst
from ambari_commons import shell
+from resource_management.core import shell as rmf_shell
__all__ = ["installedPkgsByName", "allInstalledPackages", "allAvailablePackages", "nameMatch",
"getInstalledRepos", "getInstalledPkgsByRepo", "getInstalledPkgsByNames", "getPackageDetails"]
@@ -273,3 +274,11 @@ def getReposToRemove(repos, ignoreList):
if addToRemoveList:
reposToRemove.append(repo)
return reposToRemove
+
+def getInstalledPackageVersion(package_name):
+ if OSCheck.is_ubuntu_family():
+ code, out, err = rmf_shell.checked_call("dpkg -s {0} | grep Version | awk '{{print $2}}'".format(package_name), stderr=subprocess.PIPE)
+ else:
+ code, out, err = rmf_shell.checked_call("rpm -q --queryformat '%{{version}}-%{{release}}' {0} | sed -e 's/\.el[0-9]//g'".format(package_name), stderr=subprocess.PIPE)
+
+ return out
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-common/src/main/python/resource_management/libraries/script/script.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/script/script.py b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index c954a15..3deb7a6 100644
--- a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -43,6 +43,7 @@ from resource_management.libraries.functions.version_select_util import get_comp
from resource_management.libraries.functions.version import compare_versions
from resource_management.libraries.functions.version import format_hdp_stack_version
from resource_management.libraries.functions.constants import Direction
+from resource_management.libraries.functions import packages_analyzer
from resource_management.libraries.script.config_dictionary import ConfigDictionary, UnknownConfiguration
from resource_management.core.resources.system import Execute
from contextlib import closing
@@ -68,6 +69,8 @@ USAGE = """Usage: {0} <COMMAND> <JSON_CONFIG> <BASEDIR> <STROUTPUT> <LOGGING_LEV
"""
_PASSWORD_MAP = {"/configurations/cluster-env/hadoop.user.name":"/configurations/cluster-env/hadoop.user.password"}
+DISTRO_SELECT_PACKAGE_NAME = "hdp-select"
+HDP_VERSION_PLACEHOLDER = "${hdp_version}"
def get_path_from_configuration(name, configuration):
subdicts = filter(None, name.split('/'))
@@ -94,6 +97,7 @@ class Script(object):
3 path to service metadata dir (Directory "package" inside service directory)
4 path to file with structured command output (file will be created)
"""
+ stack_version_from_hdp_select = None
structuredOut = {}
command_data_file = ""
basedir = ""
@@ -235,7 +239,37 @@ class Script(object):
raise Fail("Script '{0}' has no method '{1}'".format(sys.argv[0], command_name))
method = getattr(self, command_name)
return method
-
+
+ @staticmethod
+ def get_stack_version_from_hdp_select():
+ """
+ This works in a lazy way (calculates the version first time and stores it).
+ If you need to recalculate the version explicitly set:
+
+ Script.stack_version_from_hdp_select = None
+
+ before the call. However takes a bit of time, so better to avoid.
+
+ :param install_hdp_select: whether to ensure if hdp-select is installed, before checking the version.
+ Set this to false, if you're sure hdp-select is present at the point you call this, to save some time.
+
+ :return: hdp version including the build number. e.g.: 2.3.4.0-1234.
+ """
+ if not Script.stack_version_from_hdp_select:
+ Script.stack_version_from_hdp_select = packages_analyzer.getInstalledPackageVersion(DISTRO_SELECT_PACKAGE_NAME)
+
+ return Script.stack_version_from_hdp_select
+
+ @staticmethod
+ def format_package_name(name):
+ """
+ This function replaces ${hdp_version} placeholder into actual version.
+ """
+ package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
+ hdp_version_package_formatted = Script.get_stack_version_from_hdp_select().replace('.', package_delimiter).replace('-', package_delimiter) if HDP_VERSION_PLACEHOLDER in name else name
+ package_name = name.replace(HDP_VERSION_PLACEHOLDER, hdp_version_package_formatted)
+
+ return package_name
@staticmethod
def get_config():
@@ -397,8 +431,9 @@ class Script(object):
if isinstance(package_list_str, basestring) and len(package_list_str) > 0:
package_list = json.loads(package_list_str)
for package in package_list:
+ #import pydevd;pydevd.settrace(host='192.168.64.1',stdoutToServer=True, stderrToServer=True)
if not Script.matches_any_regexp(package['name'], exclude_packages):
- name = package['name']
+ name = Script.format_package_name(package['name'])
# HACK: On Windows, only install ambari-metrics packages using Choco Package Installer
# TODO: Update this once choco packages for hadoop are created. This is because, service metainfo.xml support
# <osFamily>any<osFamily> which would cause installation failure on Windows.
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
index 0d9687b..e71d5af 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_service.py
@@ -33,7 +33,7 @@ def accumulo_service( name,
if action == 'start':
Directory(os.path.expanduser("~"),
- user = params.accumulo_user,
+ owner = params.accumulo_user,
group = params.user_group,
recursive_ownership = True,
ignore_failures=True
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index d39ccbf..6b1c7f3 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -334,7 +334,7 @@ class InstallPackages(Script):
# Install packages
packages_were_checked = False
try:
- Package(self.get_base_packages_to_install())
+ Package('hdp-select', action="upgrade")
packages_installed_before = []
allInstalledPackages(packages_installed_before)
@@ -342,10 +342,10 @@ class InstallPackages(Script):
packages_were_checked = True
filtered_package_list = self.filter_package_list(package_list)
for package in filtered_package_list:
- name = self.format_package_name(package['name'], self.repository_version)
- Package(name,
- use_repos=list(self.current_repo_files) if OSCheck.is_ubuntu_family() else self.current_repositories,
- skip_repos=[self.REPO_FILE_NAME_PREFIX + "*"] if OSCheck.is_redhat_family() else [])
+ name = Script.format_package_name(package['name'])
+ Package(name
+ # action="upgrade" - should we user ugrade action here? to updated not versioned packages?
+ )
except Exception, err:
ret_code = 1
Logger.logger.exception("Package Manager failed to install packages. Error: {0}".format(str(err)))
@@ -407,38 +407,10 @@ class InstallPackages(Script):
)
return repo['repoName'], file_name
- def format_package_name(self, package_name, repo_id):
- """
- This method overcomes problems at SLES SP3. Zypper here behaves differently
- than at SP1, and refuses to install packages by mask if there is any installed package that
- matches this mask.
- So we preppend concrete HDP version to mask under Suse
- """
- if OSCheck.is_suse_family() and '*' in package_name:
- mask_version = re.search(r'((_\d+)*(_)?\*)', package_name).group(0)
- formatted_version = '_' + repo_id.replace('.', '_').replace('-', '_') + '*'
- return package_name.replace(mask_version, formatted_version)
- else:
- return package_name
-
def abort_handler(self, signum, frame):
Logger.error("Caught signal {0}, will handle it gracefully. Compute the actual version if possible before exiting.".format(signum))
self.check_partial_install()
- def get_base_packages_to_install(self):
- """
- HACK: list packages which should be installed without disabling any repos. (This is planned to fix in Ambari-2.2)
- """
- base_packages_to_install = ['fuse']
-
- if OSCheck.is_suse_family() or OSCheck.is_ubuntu_family():
- base_packages_to_install.append('libfuse2')
- else:
- base_packages_to_install.append('fuse-libs')
-
- return base_packages_to_install
-
-
def filter_package_list(self, package_list):
"""
Note: that we have skipUpgrade option in metainfo.xml to filter packages,
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 fe47276..e0e4c63 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,18 +24,18 @@
<version>0.6.0.2.2</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>falcon_2_2_*</name>
+ <name>falcon_${hdp_version}</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>falcon-2-2-.*</name>
+ <name>falcon-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 4fa4ff7..8d53e96 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
@@ -23,20 +23,21 @@
<displayName>Flume</displayName>
<version>1.5.2.2.2</version>
+
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>flume_2_2_*</name>
+ <name>flume_${hdp_version}</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>flume-2-2-.*</name>
+ <name>flume-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 71297b1..ccefaf2 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,24 +25,24 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>hbase_2_2_*</name>
+ <name>hbase_${hdp_version}</name>
</package>
<package>
- <name>phoenix_2_2_*</name>
+ <name>phoenix_${hdp_version}</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>hbase-2-2-.*</name>
+ <name>hbase-${hdp_version}</name>
</package>
<package>
- <name>phoenix-2-2-.*</name>
+ <name>phoenix-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 0366758..f524685 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
@@ -22,13 +22,20 @@
<name>HDFS</name>
<displayName>HDFS</displayName>
<version>2.6.0.2.2</version>
-
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>any</osFamily>
+ <packages>
+ <package>
+ <name>rpcbind</name>
+ </package>
+ </packages>
+ </osSpecific>
+ <osSpecific>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>hadoop_2_2_*</name>
+ <name>hadoop_${hdp_version}</name>
</package>
<package>
<name>snappy</name>
@@ -41,34 +48,34 @@
<skipUpgrade>true</skipUpgrade>
</package>
<package>
- <name>hadooplzo_2_2_*</name>
+ <name>hadooplzo_${hdp_version}</name>
</package>
<package>
- <name>hadoop_2_2_*-libhdfs</name>
+ <name>hadoop_${hdp_version}-libhdfs</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>hadoop-2-2-.*-client</name>
+ <name>hadoop-${hdp_version}-client</name>
</package>
<package>
- <name>hadoop-2-2-.*-hdfs-datanode</name>
+ <name>hadoop-${hdp_version}-hdfs-datanode</name>
</package>
<package>
- <name>hadoop-2-2-.*-hdfs-journalnode</name>
+ <name>hadoop-${hdp_version}-hdfs-journalnode</name>
</package>
<package>
- <name>hadoop-2-2-.*-hdfs-namenode</name>
+ <name>hadoop-${hdp_version}-hdfs-namenode</name>
</package>
<package>
- <name>hadoop-2-2-.*-hdfs-secondarynamenode</name>
+ <name>hadoop-${hdp_version}-hdfs-secondarynamenode</name>
</package>
<package>
- <name>hadoop-2-2-.*-hdfs-zkfc</name>
+ <name>hadoop-${hdp_version}-hdfs-zkfc</name>
</package>
<package>
<name>libsnappy1</name>
@@ -77,14 +84,10 @@
<name>libsnappy-dev</name>
</package>
<package>
- <name>hadooplzo-2-2-.*</name>
- </package>
- <package>
- <name>liblzo2-2</name>
- <skipUpgrade>true</skipUpgrade>
+ <name>hadooplzo-${hdp_version}</name>
</package>
<package>
- <name>libhdfs0-2-2-.*</name>
+ <name>libhdfs0-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 d59b89e..9d97946 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
@@ -56,8 +56,6 @@
</components>
-
-
<osSpecifics>
<osSpecific>
<osFamily>any</osFamily>
@@ -69,16 +67,19 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,redhat7,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>hive_2_2_*</name>
+ <name>hive_${hdp_version}</name>
+ </package>
+ <package>
+ <name>hive_${hdp_version}-hcatalog</name>
</package>
<package>
- <name>hive_2_2_*-hcatalog</name>
+ <name>hive_${hdp_version}-webhcat</name>
</package>
<package>
- <name>hive_2_2_*-webhcat</name>
+ <name>atlas-metadata_${hdp_version}-hive-plugin</name>
</package>
</packages>
</osSpecific>
@@ -105,21 +106,24 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>hive-2-2-.*</name>
+ <name>hive-${hdp_version}</name>
+ </package>
+ <package>
+ <name>hive-${hdp_version}-hcatalog</name>
</package>
<package>
- <name>hive-2-2-.*-hcatalog</name>
+ <name>hive-${hdp_version}-webhcat</name>
</package>
<package>
- <name>hive-2-2-.*-webhcat</name>
+ <name>atlas-metadata-${hdp_version}-hive-plugin</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,ubuntu12</osFamily>
+ <osFamily>redhat6,debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
<name>mysql-server</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 aa164e3..78b3021 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,10 +23,10 @@
<extends>common-services/KAFKA/0.8.1.2.2</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>kafka_2_2_*</name>
+ <name>kafka_${hdp_version}</name>
</package>
</packages>
</osSpecific>
@@ -34,7 +34,7 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>kafka-2-2-.*</name>
+ <name>kafka-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 481fca9..1b97334 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,10 +23,10 @@
<extends>common-services/KNOX/0.5.0.2.2</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>knox_2_2_*</name>
+ <name>knox_${hdp_version}</name>
</package>
</packages>
</osSpecific>
@@ -34,7 +34,7 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>knox-2-2-.*</name>
+ <name>knox-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 db7e025..d09d648 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
@@ -65,29 +65,33 @@
<name>zip</name>
</package>
<package>
+ <name>mysql-connector-java</name>
+ <skipUpgrade>true</skipUpgrade>
+ </package>
+ <package>
<name>extjs</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
<packages>
<package>
- <name>oozie_2_2_*</name>
+ <name>oozie_${hdp_version}</name>
</package>
<package>
- <name>falcon_2_2_*</name>
+ <name>falcon_${hdp_version}</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>oozie-2-2-.*</name>
+ <name>oozie-${hdp_version}</name>
</package>
<package>
- <name>falcon-2-2-.*</name>
+ <name>falcon-${hdp_version}</name>
</package>
<package>
<name>extjs</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 5472f43..818640c 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
@@ -27,7 +27,7 @@
<osFamily>redhat6,suse11</osFamily>
<packages>
<package>
- <name>pig_2_2_*</name>
+ <name>pig_${hdp_version}</name>
</package>
</packages>
</osSpecific>
@@ -35,7 +35,7 @@
<osFamily>ubuntu12</osFamily>
<packages>
<package>
- <name>pig-2-2-.*</name>
+ <name>pig-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 0c457f7..8a4b335 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,13 +32,13 @@
</themes>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>ranger_2_2_*-admin</name>
+ <name>ranger_${hdp_version}-admin</name>
</package>
<package>
- <name>ranger_2_2_*-usersync</name>
+ <name>ranger_${hdp_version}-usersync</name>
</package>
</packages>
</osSpecific>
@@ -46,10 +46,10 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>ranger-2-2-.*-admin</name>
+ <name>ranger-${hdp_version}-admin</name>
</package>
<package>
- <name>ranger-2-2-.*-usersync</name>
+ <name>ranger-${hdp_version}-usersync</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 47bb207..624deda 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,13 +23,13 @@
<extends>common-services/SLIDER/0.60.0.2.2</extends>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>slider_2_2_*</name>
+ <name>slider_${hdp_version}</name>
</package>
<package>
- <name>storm_2_2_*</name>
+ <name>storm-${hdp_version}-slider-client</name>
</package>
</packages>
</osSpecific>
@@ -37,10 +37,10 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>slider-2-2-.*</name>
+ <name>slider-${hdp_version}</name>
</package>
<package>
- <name>storm-2-2-.*</name>
+ <name>storm-${hdp_version}-slider-client</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 5cb598e..9f906a1 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,13 +27,13 @@
<version>1.2.1.2.2</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>spark_2_2_*</name>
+ <name>spark_${hdp_version}</name>
</package>
<package>
- <name>spark_2_2_*-python</name>
+ <name>spark_${hdp_version}-python</name>
</package>
</packages>
</osSpecific>
@@ -41,10 +41,10 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>spark-2-2-.*</name>
+ <name>spark-${hdp_version}</name>
</package>
<package>
- <name>spark-2-2-.*-python</name>
+ <name>spark-${hdp_version}-python</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 e7ff122..b3c0e34 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
@@ -32,18 +32,18 @@
</packages>
</osSpecific>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>sqoop_2_2_*</name>
+ <name>sqoop_${hdp_version}</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>sqoop-2-2-.*</name>
+ <name>sqoop-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 ccf765b..a0144d7 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,18 +31,18 @@
</components>
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>storm_2_2_*</name>
+ <name>storm_${hdp_version}</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>storm-2-2-.*</name>
+ <name>storm-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 b0ccddd..3bb9aea 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,18 +25,18 @@
<osSpecifics>
<osSpecific>
- <osFamily>redhat6,suse11</osFamily>
+ <osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>tez_2_2_*</name>
+ <name>tez_${hdp_version}</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>ubuntu12</osFamily>
+ <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>tez-2-2-.*</name>
+ <name>tez-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 189defc..20de188 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
@@ -35,13 +35,13 @@
<osFamily>redhat6,suse11</osFamily>
<packages>
<package>
- <name>hadoop_2_2_*-yarn</name>
+ <name>hadoop_${hdp_version}-yarn</name>
</package>
<package>
- <name>hadoop_2_2_*-mapreduce</name>
+ <name>hadoop_${hdp_version}-mapreduce</name>
</package>
<package>
- <name>hadoop_2_2_*-hdfs</name>
+ <name>hadoop_${hdp_version}-hdfs</name>
</package>
</packages>
</osSpecific>
@@ -49,10 +49,10 @@
<osFamily>ubuntu12</osFamily>
<packages>
<package>
- <name>hadoop-2-2-.*-yarn</name>
+ <name>hadoop-${hdp_version}-yarn</name>
</package>
<package>
- <name>hadoop-2-2-.*-mapreduce</name>
+ <name>hadoop-${hdp_version}-mapreduce</name>
</package>
</packages>
</osSpecific>
@@ -75,7 +75,7 @@
<osFamily>redhat6,suse11</osFamily>
<packages>
<package>
- <name>hadoop_2_2_*-mapreduce</name>
+ <name>hadoop_${hdp_version}-mapreduce</name>
</package>
</packages>
</osSpecific>
@@ -83,7 +83,7 @@
<osFamily>ubuntu12</osFamily>
<packages>
<package>
- <name>hadoop-2-2-.*-mapreduce</name>
+ <name>hadoop-${hdp_version}-mapreduce</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
index d0b37cf..9163a0d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
@@ -22,31 +22,6 @@
<name>ZOOKEEPER</name>
<displayName>ZooKeeper</displayName>
<version>3.4.6.2.2</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>zookeeper_2_2_*</name>
- </package>
- <package>
- <name>zookeeper_2_2_*-server</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>ubuntu12</osFamily>
- <packages>
- <package>
- <name>zookeeper-2-2-.*</name>
- </package>
- <package>
- <name>zookeeper-2-2-.*-server</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 b19aac1..d24d9b8 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
@@ -27,7 +27,7 @@
<osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>accumulo_2_3_*</name>
+ <name>accumulo_${hdp_version}</name>
</package>
</packages>
</osSpecific>
@@ -35,7 +35,7 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>accumulo-2-3-.*</name>
+ <name>accumulo-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 c3a3c81..7e27659 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
@@ -27,7 +27,7 @@
<osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>atlas-metadata_2_3_*</name>
+ <name>atlas-metadata_${hdp_version}</name>
</package>
</packages>
</osSpecific>
@@ -35,7 +35,7 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>atlas-metadata-2-3-.*</name>
+ <name>atlas-metadata-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..66e73b9 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
@@ -21,24 +21,6 @@
<service>
<name>FALCON</name>
<version>0.6.1.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>falcon_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>falcon-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..e377396 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
@@ -21,26 +21,6 @@
<service>
<name>FLUME</name>
<version>1.5.2.2.3</version>
-
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>flume_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>flume-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 a37378c..0614cf7 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
@@ -36,31 +36,6 @@
</component>
</components>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>hbase_2_3_*</name>
- </package>
- <package>
- <name>phoenix_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>hbase-2-3-.*</name>
- </package>
- <package>
- <name>phoenix-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
<themes>
<theme>
<fileName>theme.json</fileName>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 d103caf..8c992d2 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
@@ -46,77 +46,6 @@
</component>
</components>
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>rpcbind</name>
- </package>
- </packages>
- </osSpecific>
-
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>hadoop_2_3_*</name>
- </package>
- <package>
- <name>snappy</name>
- </package>
- <package>
- <name>snappy-devel</name>
- </package>
- <package>
- <name>lzo</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- <package>
- <name>hadooplzo_2_3_*</name>
- </package>
- <package>
- <name>hadoop_2_3_*-libhdfs</name>
- </package>
- </packages>
- </osSpecific>
-
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>hadoop-2-3-.*-client</name>
- </package>
- <package>
- <name>hadoop-2-3-.*-hdfs-datanode</name>
- </package>
- <package>
- <name>hadoop-2-3-.*-hdfs-journalnode</name>
- </package>
- <package>
- <name>hadoop-2-3-.*-hdfs-namenode</name>
- </package>
- <package>
- <name>hadoop-2-3-.*-hdfs-secondarynamenode</name>
- </package>
- <package>
- <name>hadoop-2-3-.*-hdfs-zkfc</name>
- </package>
- <package>
- <name>libsnappy1</name>
- </package>
- <package>
- <name>libsnappy-dev</name>
- </package>
- <package>
- <name>hadooplzo-2-3-.*</name>
- </package>
- <package>
- <name>libhdfs0-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
<quickLinksConfigurations>
<quickLinksConfiguration>
<fileName>quicklinks.json</fileName>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 b6b6bb8..0c70dbb 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
@@ -21,93 +21,6 @@
<service>
<name>HIVE</name>
<version>1.2.1.2.3</version>
-
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>mysql-connector-java</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>hive_2_3_*</name>
- </package>
- <package>
- <name>hive_2_3_*-hcatalog</name>
- </package>
- <package>
- <name>hive_2_3_*-webhcat</name>
- </package>
- <package>
- <name>atlas-metadata*-hive-plugin</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>mysql</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat7</osFamily>
- <packages>
- <package>
- <name>mysql-community-release</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- <package>
- <name>mysql-community-server</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>hive-2-3-.*</name>
- </package>
- <package>
- <name>hive-2-3-.*-hcatalog</name>
- </package>
- <package>
- <name>hive-2-3-.*-webhcat</name>
- </package>
- <package>
- <name>atlas-metadata.*-hive-plugin</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat6,debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>mysql-server</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>suse11</osFamily>
- <packages>
- <package>
- <name>mysql-client</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..a40b08d 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
@@ -21,24 +21,6 @@
<service>
<name>KAFKA</name>
<version>0.9.0.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>kafka_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>kafka-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
<configuration-dependencies>
<config-type>kafka-broker</config-type>
</configuration-dependencies>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..48ba394 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
@@ -21,24 +21,6 @@
<service>
<name>KNOX</name>
<version>0.6.0.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>knox_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>knox-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 2fe0ed0..12c8b5f 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
@@ -21,6 +21,13 @@
<service>
<name>OOZIE</name>
<extends>common-services/OOZIE/4.2.0.2.3</extends>
+ <quickLinksConfigurations>
+ <quickLinksConfiguration>
+ <fileName>quicklinks.json</fileName>
+ <default>true</default>
+ </quickLinksConfiguration>
+ </quickLinksConfigurations>
+
<osSpecifics>
<osSpecific>
<osFamily>any</osFamily>
@@ -41,10 +48,10 @@
<osFamily>redhat5,redhat6,redhat7,suse11</osFamily>
<packages>
<package>
- <name>oozie_2_3_*</name>
+ <name>oozie_${hdp_version}</name>
</package>
<package>
- <name>falcon_2_3_*</name>
+ <name>falcon_${hdp_version}</name>
</package>
</packages>
</osSpecific>
@@ -52,10 +59,10 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>oozie-2-3-.*</name>
+ <name>oozie-${hdp_version}</name>
</package>
<package>
- <name>falcon-2-3-.*</name>
+ <name>falcon-${hdp_version}</name>
</package>
<package>
<name>extjs</name>
@@ -66,12 +73,7 @@
</packages>
</osSpecific>
</osSpecifics>
- <quickLinksConfigurations>
- <quickLinksConfiguration>
- <fileName>quicklinks.json</fileName>
- <default>true</default>
- </quickLinksConfiguration>
- </quickLinksConfigurations>
+
</service>
</services>
</metainfo>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..fe05cff 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
@@ -26,10 +26,10 @@
<osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>pig_2_3_*</name>
+ <name>pig_${hdp_version}</name>
</package>
<package>
- <name>datafu_2_3_*</name>
+ <name>datafu_${hdp_version}</name>
</package>
</packages>
</osSpecific>
@@ -37,10 +37,10 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>pig-2-3-.*</name>
+ <name>pig-${hdp_version}</name>
</package>
<package>
- <name>datafu-2-3-.*</name>
+ <name>datafu-${hdp_version}</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 bc52e85..e7c095f 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
@@ -27,31 +27,6 @@
<comment>Comprehensive security for Hadoop</comment>
<version>0.5.0.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>ranger_2_3_*-admin</name>
- </package>
- <package>
- <name>ranger_2_3_*-usersync</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>ranger-2-3-.*-admin</name>
- </package>
- <package>
- <name>ranger-2-3-.*-usersync</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
<themes>
<theme>
<fileName>theme_version_2.json</fileName>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 b1a5584..03768f0 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
@@ -29,7 +29,7 @@
<osFamily>redhat7,redhat6,suse11</osFamily>
<packages>
<package>
- <name>ranger_2_3_*-kms</name>
+ <name>ranger_${hdp_version}-kms</name>
</package>
</packages>
</osSpecific>
@@ -37,7 +37,7 @@
<osFamily>debian7,ubuntu12,ubuntu14</osFamily>
<packages>
<package>
- <name>ranger-2-3-.*-kms</name>
+ <name>ranger-${hdp_version}-kms</name>
</package>
</packages>
</osSpecific>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..ce39fdc 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
@@ -21,30 +21,6 @@
<service>
<name>SLIDER</name>
<version>0.80.0.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>slider_2_3_*</name>
- </package>
- <package>
- <name>storm_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>slider-2-3-.*</name>
- </package>
- <package>
- <name>storm-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 2cf290b..bb3b6ce 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
@@ -25,30 +25,6 @@
<name>SPARK</name>
<version>1.5.2.2.3</version>
<extends>common-services/SPARK/1.4.1.2.3</extends>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>spark_2_3_*</name>
- </package>
- <package>
- <name>spark_2_3_*-python</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>spark-2-3-.*</name>
- </package>
- <package>
- <name>spark-2-3-.*-python</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
<requiredServices>
<service>YARN</service>
</requiredServices>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..d5d18b8 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
@@ -21,33 +21,6 @@
<service>
<name>SQOOP</name>
<version>1.4.6.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>mysql-connector-java</name>
- <skipUpgrade>true</skipUpgrade>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>sqoop_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>sqoop-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..18e0daf 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
@@ -22,24 +22,6 @@
<service>
<name>STORM</name>
<version>0.10.0</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>storm_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>storm-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
<components>
<component>
<name>NIMBUS</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..6726351 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
@@ -21,26 +21,6 @@
<service>
<name>TEZ</name>
<version>0.7.0.2.3</version>
-
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>tez_2_3_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>tez-2-3-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 088bb16..c6ee13d 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
@@ -22,34 +22,6 @@
<service>
<name>YARN</name>
<version>2.7.1.2.3</version>
-
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>hadoop_2_3_*-yarn</name>
- </package>
- <package>
- <name>hadoop_2_3_*-mapreduce</name>
- </package>
- <package>
- <name>hadoop_2_3_*-hdfs</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>hadoop-2-3-.*-yarn</name>
- </package>
- <package>
- <name>hadoop-2-3-.*-mapreduce</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
<quickLinksConfigurations>
<quickLinksConfiguration>
<fileName>quicklinks.json</fileName>
@@ -61,24 +33,6 @@
<service>
<name>MAPREDUCE2</name>
<version>2.7.1.2.3</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>hadoop_2_3_*-mapreduce</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>hadoop-2-3-.*-mapreduce</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
<configuration-dir>configuration-mapred</configuration-dir>
<quickLinksConfigurations-dir>quicklinks-mapred</quickLinksConfigurations-dir>
<quickLinksConfigurations>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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 c2fe742..3e27928 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,29 +23,28 @@
<version>3.4.6.2.3</version>
<osSpecifics>
<osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
+ <osFamily>redhat6,suse11</osFamily>
<packages>
<package>
- <name>zookeeper_2_3_*</name>
+ <name>zookeeper_${hdp_version}</name>
</package>
<package>
- <name>zookeeper_2_3_*-server</name>
+ <name>zookeeper_${hdp_version}-server</name>
</package>
</packages>
</osSpecific>
<osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
+ <osFamily>ubuntu12</osFamily>
<packages>
<package>
- <name>zookeeper-2-3-.*</name>
+ <name>zookeeper-${hdp_version}</name>
</package>
<package>
- <name>zookeeper-2-3-.*-server</name>
+ <name>zookeeper-${hdp_version}-server</name>
</package>
</packages>
</osSpecific>
</osSpecifics>
-
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..0ea7b84 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
@@ -21,35 +21,6 @@
<service>
<name>ACCUMULO</name>
<version>1.7.0.2.4</version>
- <osSpecifics>
- <osSpecifics>
- <osSpecific>
- <osFamily>any</osFamily>
- <packages>
- <package>
- <name>accumulo</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>accumulo_2_4_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>accumulo-2-4-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..1b98f44 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
@@ -21,24 +21,6 @@
<service>
<name>ATLAS</name>
<version>0.5.0.2.4</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>atlas-metadata_2_4_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>atlas-metadata-2-4-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..4a1e399e 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
@@ -21,24 +21,6 @@
<service>
<name>FALCON</name>
<version>0.6.1.2.4</version>
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>falcon_2_4_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>falcon-2-4-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..f2d4d9d 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
@@ -21,26 +21,6 @@
<service>
<name>FLUME</name>
<version>1.5.2.2.4</version>
-
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>flume_2_4_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>flume-2-4-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
</service>
</services>
</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce4f544/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..2ea80d1 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
@@ -21,32 +21,6 @@
<service>
<name>HBASE</name>
<version>1.1.2.2.4</version>
-
- <osSpecifics>
- <osSpecific>
- <osFamily>redhat7,redhat6,suse11</osFamily>
- <packages>
- <package>
- <name>hbase_2_4_*</name>
- </package>
- <package>
- <name>phoenix_2_4_*</name>
- </package>
- </packages>
- </osSpecific>
- <osSpecific>
- <osFamily>debian7,ubuntu12,ubuntu14</osFamily>
- <packages>
- <package>
- <name>hbase-2-4-.*</name>
- </package>
- <package>
- <name>phoenix-2-4-.*</name>
- </package>
- </packages>
- </osSpecific>
- </osSpecifics>
-
</service>
</services>
</metainfo>