You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/08/19 22:00:37 UTC
ambari git commit: AMBARI-12820: [PluggableStackDefinition] RU: PHD
Install packages fails due to atlas-metadata*-hive-plugin package dependency
in HIVE (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 73a1db1ac -> ba7a94fde
AMBARI-12820: [PluggableStackDefinition] RU: PHD Install packages fails due to atlas-metadata*-hive-plugin package dependency in HIVE (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba7a94fd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba7a94fd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba7a94fd
Branch: refs/heads/trunk
Commit: ba7a94fde5088662d9c02f7e3e1a1fc5213b3d23
Parents: 73a1db1
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Wed Aug 19 13:00:30 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Wed Aug 19 13:00:30 2015 -0700
----------------------------------------------------------------------
.../GenerateStackDefinition.py | 2 +-
.../pluggable_stack_definition/configs/PHD.json | 61 +++++++++++++++++++-
2 files changed, 61 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba7a94fd/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
index 92d5b70..2ba6f77 100644
--- a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
+++ b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
@@ -337,7 +337,7 @@ def process_repoinfo_xml(file_path, config_data, stack_version_changes, stack):
root = tree.getroot()
remove_list = list()
if 'family' in stack:
- for os_tag in root.iter("os"):
+ for os_tag in root.getiterator("os"):
os_family = os_tag.get('family')
if os_family not in stack.family:
remove_list.append(os_tag)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ba7a94fd/ambari-common/src/main/python/pluggable_stack_definition/configs/PHD.json
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/pluggable_stack_definition/configs/PHD.json b/ambari-common/src/main/python/pluggable_stack_definition/configs/PHD.json
index f3beb6e..5c96bd6 100644
--- a/ambari-common/src/main/python/pluggable_stack_definition/configs/PHD.json
+++ b/ambari-common/src/main/python/pluggable_stack_definition/configs/PHD.json
@@ -190,7 +190,66 @@
"name": "MAPREDUCE2"
},
{
- "name": "HIVE"
+ "name": "HIVE",
+ "packages":[
+ {
+ "family": "any",
+ "packages": [
+ {
+ "name": "mysql-connector-java",
+ "skipUpgrade": "true"
+ }
+ ]
+ },
+ {
+ "family": "redhat6,redhat7,suse11",
+ "packages": [
+ "hive_3_3_*",
+ "hive_3_3_*-hcatalog",
+ "hive_3_3_*-webhcat"
+ ]
+ },
+ {
+ "family": "redhat6,suse11",
+ "packages": [
+ {
+ "name": "mysql",
+ "skipUpgrade": "true"
+ }
+ ]
+ },
+ {
+ "family": "redhat7",
+ "packages": [
+ {
+ "name": "mysql-community-release",
+ "skipUpgrade": "true"
+ },
+ {
+ "name": "mysql-community-server",
+ "skipUpgrade": "true"
+ }
+ ]
+ },
+ {
+ "family": "redhat6",
+ "packages": [
+ {
+ "name": "mysql-server",
+ "skipUpgrade": "true"
+ }
+ ]
+ },
+ {
+ "family": "suse11",
+ "packages": [
+ {
+ "name": "mysql-client",
+ "skipUpgrade": "true"
+ }
+ ]
+ }
+ ]
},
{
"name": "TEZ"