Repository: ambari Updated Branches: refs/heads/trunk cb54d4778 -> ee6852e22
AMBARI-8049 HBASE client won't install on 2.1.GlusterFS - missing configuration dictionary for 'hdfs-site' Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee6852e2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee6852e2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee6852e2 Branch: refs/heads/trunk Commit: ee6852e22260c076de00a04eed562d523d06132d Parents: cb54d47 Author: Scott Creeley <[email protected]> Authored: Thu Oct 30 20:21:38 2014 -0400 Committer: Scott Creeley <[email protected]> Committed: Thu Oct 30 20:21:38 2014 -0400 ---------------------------------------------------------------------- .../HDP/2.0.6/services/HBASE/package/scripts/hbase.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ee6852e2/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py index 2829c7b..d312f0b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/hbase.py @@ -52,21 +52,22 @@ def hbase(name=None # 'master' or 'regionserver' or 'client' group = params.user_group ) - XmlConfig( "hdfs-site.xml", + if 'hdfs-site' in params.config['configurations']: + XmlConfig( "hdfs-site.xml", conf_dir = params.hbase_conf_dir, configurations = params.config['configurations']['hdfs-site'], configuration_attributes=params.config['configuration_attributes']['hdfs-site'], owner = params.hbase_user, group = params.user_group - ) + ) - XmlConfig("hdfs-site.xml", + XmlConfig("hdfs-site.xml", conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['hdfs-site'], configuration_attributes=params.config['configuration_attributes']['hdfs-site'], owner=params.hdfs_user, group=params.user_group - ) + ) if 'hbase-policy' in params.config['configurations']: XmlConfig( "hbase-policy.xml",
