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 2017/07/19 12:23:46 UTC
[4/4] ambari git commit: AMBARI-21496. Fix HDP base services to
handle changed config paths (aonishuk)
AMBARI-21496. Fix HDP base services to handle changed config paths (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9d6c7c81
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9d6c7c81
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9d6c7c81
Branch: refs/heads/branch-3.0-perf
Commit: 9d6c7c81d143e41a4ab2592d13010a477a251659
Parents: e41dcd3
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Jul 19 15:22:26 2017 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Jul 19 15:22:26 2017 +0300
----------------------------------------------------------------------
.../package/scripts/accumulo_configuration.py | 4 +--
.../1.6.1.2.2.0/package/scripts/params.py | 6 ++---
.../package/scripts/status_params.py | 4 +--
.../0.1.0/package/scripts/params.py | 10 ++++----
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 26 ++++++++++----------
.../0.1.0/package/scripts/hbase.py | 8 +++---
.../0.1.0/package/scripts/params.py | 16 ++++++------
.../0.1.0/package/scripts/status_params.py | 2 +-
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 2 +-
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 22 ++++++++---------
.../package/scripts/setup_ranger_atlas.py | 6 ++---
.../0.1.0.2.3/package/scripts/status_params.py | 4 +--
.../DRUID/0.9.2/package/scripts/params.py | 8 +++---
.../FALCON/0.5.0.2.1/package/scripts/params.py | 2 +-
.../0.5.0.2.1/package/scripts/params_linux.py | 10 ++++----
.../0.5.0.2.1/package/scripts/status_params.py | 6 ++---
.../FLUME/1.4.0.2.0/package/scripts/params.py | 12 ++++-----
.../1.4.0.2.0/package/scripts/params_linux.py | 4 +--
.../GANGLIA/3.5.0/package/scripts/params.py | 13 +++++-----
.../HAWQ/2.0.0/package/scripts/params.py | 4 +--
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 10 ++++----
.../0.96.0.2.0/package/scripts/params_linux.py | 16 ++++++------
.../package/scripts/setup_ranger_hbase.py | 12 ++++-----
.../0.96.0.2.0/package/scripts/status_params.py | 6 ++---
.../HBASE/2.0.0.3.0/package/scripts/hbase.py | 10 ++++----
.../2.0.0.3.0/package/scripts/params_linux.py | 16 ++++++------
.../package/scripts/setup_ranger_hbase.py | 12 ++++-----
.../2.0.0.3.0/package/scripts/status_params.py | 6 ++---
.../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 16 ++++++------
.../2.1.0.2.0/package/scripts/install_params.py | 2 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 22 ++++++++---------
.../2.1.0.2.0/package/scripts/params_windows.py | 2 +-
.../package/scripts/setup_ranger_hdfs.py | 12 ++++-----
.../2.1.0.2.0/package/scripts/status_params.py | 4 +--
.../HDFS/3.0.0.3.0/package/scripts/hdfs.py | 16 ++++++------
.../3.0.0.3.0/package/scripts/install_params.py | 2 +-
.../3.0.0.3.0/package/scripts/params_linux.py | 22 ++++++++---------
.../3.0.0.3.0/package/scripts/params_windows.py | 2 +-
.../package/scripts/setup_ranger_hdfs.py | 12 ++++-----
.../3.0.0.3.0/package/scripts/status_params.py | 4 +--
.../HIVE/0.12.0.2.0/package/scripts/hcat.py | 4 +--
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 10 ++++----
.../package/scripts/hive_interactive.py | 8 +++---
.../0.12.0.2.0/package/scripts/params_linux.py | 14 +++++------
.../package/scripts/params_windows.py | 2 +-
.../package/scripts/setup_ranger_hive.py | 12 ++++-----
.../scripts/setup_ranger_hive_interactive.py | 6 ++---
.../0.12.0.2.0/package/scripts/status_params.py | 6 ++---
.../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 6 ++---
.../HIVE/2.1.0.3.0/package/scripts/hcat.py | 4 +--
.../HIVE/2.1.0.3.0/package/scripts/hive.py | 10 ++++----
.../package/scripts/hive_interactive.py | 8 +++---
.../2.1.0.3.0/package/scripts/params_linux.py | 14 +++++------
.../2.1.0.3.0/package/scripts/params_windows.py | 2 +-
.../package/scripts/setup_ranger_hive.py | 12 ++++-----
.../scripts/setup_ranger_hive_interactive.py | 6 ++---
.../2.1.0.3.0/package/scripts/status_params.py | 6 ++---
.../HIVE/2.1.0.3.0/package/scripts/webhcat.py | 6 ++---
.../KAFKA/0.8.1/package/scripts/params.py | 22 ++++++++---------
.../1.10.3-10/package/scripts/params.py | 10 ++++----
.../1.10.3-10/package/scripts/status_params.py | 2 +-
.../KNOX/0.5.0.2.2/package/scripts/knox.py | 4 +--
.../0.5.0.2.2/package/scripts/params_linux.py | 16 ++++++------
.../0.5.0.2.2/package/scripts/params_windows.py | 2 +-
.../package/scripts/setup_ranger_knox.py | 14 +++++------
.../0.5.0.2.2/package/scripts/status_params.py | 6 ++---
.../LOGSEARCH/0.5.0/package/scripts/params.py | 6 ++---
.../MAHOUT/1.0.0.2.3/package/scripts/mahout.py | 2 +-
.../MAHOUT/1.0.0.2.3/package/scripts/params.py | 6 ++---
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 16 ++++++------
.../4.0.0.2.0/package/scripts/oozie_client.py | 2 +-
.../OOZIE/4.0.0.2.0/package/scripts/params.py | 6 ++---
.../4.0.0.2.0/package/scripts/params_linux.py | 12 ++++-----
.../4.0.0.2.0/package/scripts/status_params.py | 6 ++---
.../0.12.0.2.0/package/scripts/params_linux.py | 6 ++---
.../0.16.1.3.0/package/scripts/params_linux.py | 6 ++---
.../PXF/3.0.0/package/scripts/pxf.py | 2 +-
.../RANGER/0.4.0/package/scripts/params.py | 14 +++++------
.../0.4.0/package/scripts/setup_ranger_xml.py | 16 ++++++------
.../0.4.0/package/scripts/status_params.py | 4 +--
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 16 ++++++------
.../0.5.0.2.3/package/scripts/params.py | 12 ++++-----
.../0.5.0.2.3/package/scripts/status_params.py | 4 +--
.../SLIDER/0.60.0.2.2/package/scripts/params.py | 4 +--
.../0.60.0.2.2/package/scripts/params_linux.py | 2 +-
.../SLIDER/0.91.0.3.0/package/scripts/params.py | 4 +--
.../0.91.0.3.0/package/scripts/params_linux.py | 2 +-
.../SPARK/1.2.1/package/scripts/params.py | 8 +++---
.../1.2.1/package/scripts/status_params.py | 2 +-
.../SPARK/2.2.0/scripts/params.py | 6 ++---
.../SPARK/2.2.0/scripts/status_params.py | 2 +-
.../SPARK2/2.0.0/package/scripts/params.py | 6 ++---
.../2.0.0/package/scripts/status_params.py | 2 +-
.../1.4.4.2.0/package/scripts/params_linux.py | 10 ++++----
.../SQOOP/1.4.4.2.0/package/scripts/sqoop.py | 2 +-
.../STORM/0.9.1/package/scripts/params_linux.py | 12 ++++-----
.../0.9.1/package/scripts/setup_ranger_storm.py | 14 +++++------
.../0.9.1/package/scripts/status_params.py | 6 ++---
.../0.4.0.2.1/package/scripts/params_linux.py | 6 ++---
.../TEZ/0.4.0.2.1/package/scripts/tez.py | 4 +--
.../TEZ/0.4.0.2.1/package/scripts/tez_client.py | 2 +-
.../0.9.0.3.0/package/scripts/params_linux.py | 6 ++---
.../TEZ/0.9.0.3.0/package/scripts/tez.py | 4 +--
.../TEZ/0.9.0.3.0/package/scripts/tez_client.py | 2 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 14 +++++------
.../2.1.0.2.0/package/scripts/params_windows.py | 2 +-
.../package/scripts/setup_ranger_yarn.py | 6 ++---
.../2.1.0.2.0/package/scripts/status_params.py | 4 +--
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 22 ++++++++---------
.../3.0.0.3.0/package/scripts/params_linux.py | 14 +++++------
.../3.0.0.3.0/package/scripts/params_windows.py | 2 +-
.../package/scripts/setup_ranger_yarn.py | 6 ++---
.../3.0.0.3.0/package/scripts/status_params.py | 4 +--
.../YARN/3.0.0.3.0/package/scripts/yarn.py | 22 ++++++++---------
.../0.6.0.2.5/package/scripts/master.py | 6 ++---
.../0.6.0.2.5/package/scripts/params.py | 7 +++---
.../3.4.5/package/scripts/params_linux.py | 8 +++---
.../3.4.5/package/scripts/params_windows.py | 4 +--
.../3.4.5/package/scripts/status_params.py | 6 ++---
119 files changed, 476 insertions(+), 478 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
index f65b68a..d3ad1e1 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_configuration.py
@@ -51,7 +51,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or '
XmlConfig("accumulo-site.xml",
conf_dir = dest_conf_dir,
configurations = configs,
- configuration_attributes=params.config['configuration_attributes']['accumulo-site'],
+ configuration_attributes=params.config['configurationAttributes']['accumulo-site'],
owner = params.accumulo_user,
group = params.user_group,
mode = 0644
@@ -81,7 +81,7 @@ def setup_conf_dir(name=None): # 'master' or 'tserver' or 'monitor' or 'gc' or '
XmlConfig( "accumulo-site.xml",
conf_dir = dest_conf_dir,
configurations = configs,
- configuration_attributes=params.config['configuration_attributes']['accumulo-site'],
+ configuration_attributes=params.config['configurationAttributes']['accumulo-site'],
owner = params.accumulo_user,
group = params.user_group,
mode = 0600
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
index 53cf002..c1e518f 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/params.py
@@ -45,7 +45,7 @@ stack_name = status_params.stack_name
# stack version
version = default("/commandParams/version", None)
-stack_version_unformatted = config['hostLevelParams']['stack_version']
+stack_version_unformatted = config['clusterLevelParams']['stack_version']
stack_version_formatted = format_stack_version(stack_version_unformatted)
has_secure_user_auth = False
@@ -77,7 +77,7 @@ user_group = config['configurations']['cluster-env']['user_group']
pid_dir = status_params.pid_dir
# accumulo env
-java64_home = config['hostLevelParams']['java_home']
+java64_home = config['ambariLevelParams']['java_home']
accumulo_master_heapsize = config['configurations']['accumulo-env']['accumulo_master_heapsize']
accumulo_tserver_heapsize = config['configurations']['accumulo-env']['accumulo_tserver_heapsize']
accumulo_monitor_heapsize = config['configurations']['accumulo-env']['accumulo_monitor_heapsize']
@@ -147,7 +147,7 @@ metrics_collection_period = default("/configurations/ams-site/timeline.metrics.s
# if accumulo is selected accumulo_tserver_hosts should not be empty, but still default just in case
if 'slave_hosts' in config['clusterHostInfo']:
- tserver_hosts = default('/clusterHostInfo/accumulo_tserver_hosts', '/clusterHostInfo/slave_hosts')
+ tserver_hosts = default('/clusterHostInfo/accumulo_tserver_hosts', '/clusterHostInfo/datanode_hosts')
else:
tserver_hosts = default('/clusterHostInfo/accumulo_tserver_hosts', '/clusterHostInfo/all_hosts')
master_hosts = default('/clusterHostInfo/accumulo_master_hosts', [])
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
index 9fc89f1..9baee3c 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/status_params.py
@@ -44,10 +44,10 @@ pid_dir = config['configurations']['accumulo-env']['accumulo_pid_dir']
accumulo_user = config['configurations']['accumulo-env']['accumulo_user']
# Security related/required params
-hostname = config['hostname']
+hostname = config['agentLevelParams']['hostname']
security_enabled = config['configurations']['cluster-env']['security_enabled']
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
# stack name
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
index acf420e..53981ef 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
@@ -59,9 +59,9 @@ user_group = config['configurations']['cluster-env']['user_group']
fetch_nonlocal_groups = config['configurations']['cluster-env']["fetch_nonlocal_groups"]
# shared configs
-java64_home = config['hostLevelParams']['java_home']
+java64_home = config['ambariLevelParams']['java_home']
java_exec = format("{java64_home}/bin/java")
-zookeeper_hosts_list = config['clusterHostInfo']['zookeeper_hosts']
+zookeeper_hosts_list = config['clusterHostInfo']['zookeeper_server_hosts']
zookeeper_hosts_list.sort()
# get comma separated list of zookeeper hosts from clusterHostInfo
zookeeper_hosts = ",".join(zookeeper_hosts_list)
@@ -102,17 +102,17 @@ zookeeper_port = default('/configurations/zoo.cfg/clientPort', None)
# get comma separated list of zookeeper hosts from clusterHostInfo
index = 0
zookeeper_quorum = ""
-for host in config['clusterHostInfo']['zookeeper_hosts']:
+for host in config['clusterHostInfo']['zookeeper_server_hosts']:
zookeeper_quorum += host + ":" + str(zookeeper_port)
index += 1
- if index < len(config['clusterHostInfo']['zookeeper_hosts']):
+ if index < len(config['clusterHostInfo']['zookeeper_server_hosts']):
zookeeper_quorum += ","
default_ranger_audit_users = 'nn,hbase,hive,knox,kafka,kms,storm,yarn,nifi'
if security_enabled:
kinit_path_local = status_params.kinit_path_local
- _hostname_lowercase = config['hostname'].lower()
+ _hostname_lowercase = config['agentLevelParams']['hostname'].lower()
infra_solr_jaas_file = infra_solr_conf + '/infra_solr_jaas.conf'
infra_solr_kerberos_keytab = config['configurations']['infra-solr-env']['infra_solr_kerberos_keytab']
infra_solr_kerberos_principal = config['configurations']['infra-solr-env']['infra_solr_kerberos_principal'].replace('_HOST',_hostname_lowercase)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
index a929847..d17925c 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
@@ -50,7 +50,7 @@ def ams(name=None):
XmlConfig("ams-site.xml",
conf_dir=params.ams_collector_conf_dir,
configurations=params.config['configurations']['ams-site'],
- configuration_attributes=params.config['configuration_attributes']['ams-site'],
+ configuration_attributes=params.config['configurationAttributes']['ams-site'],
owner=params.ams_user,
)
@@ -62,7 +62,7 @@ def ams(name=None):
XmlConfig( "hbase-site.xml",
conf_dir = params.ams_collector_conf_dir,
configurations = merged_ams_hbase_site,
- configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
+ configuration_attributes=params.config['configurationAttributes']['ams-hbase-site'],
owner = params.ams_user,
)
@@ -87,7 +87,7 @@ def ams(name=None):
XmlConfig("hdfs-site.xml",
conf_dir=params.ams_collector_conf_dir,
configurations=params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
@@ -96,7 +96,7 @@ def ams(name=None):
XmlConfig("hdfs-site.xml",
conf_dir=params.hbase_conf_dir,
configurations=params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
@@ -105,7 +105,7 @@ def ams(name=None):
XmlConfig("core-site.xml",
conf_dir=params.ams_collector_conf_dir,
configurations=params.config['configurations']['core-site'],
- configuration_attributes=params.config['configuration_attributes']['core-site'],
+ configuration_attributes=params.config['configurationAttributes']['core-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
@@ -114,7 +114,7 @@ def ams(name=None):
XmlConfig("core-site.xml",
conf_dir=params.hbase_conf_dir,
configurations=params.config['configurations']['core-site'],
- configuration_attributes=params.config['configuration_attributes']['core-site'],
+ configuration_attributes=params.config['configurationAttributes']['core-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
@@ -204,7 +204,7 @@ def ams(name=None, action=None):
XmlConfig("ams-site.xml",
conf_dir=params.ams_collector_conf_dir,
configurations=params.config['configurations']['ams-site'],
- configuration_attributes=params.config['configuration_attributes']['ams-site'],
+ configuration_attributes=params.config['configurationAttributes']['ams-site'],
owner=params.ams_user,
group=params.user_group
)
@@ -212,7 +212,7 @@ def ams(name=None, action=None):
XmlConfig("ssl-server.xml",
conf_dir=params.ams_collector_conf_dir,
configurations=params.config['configurations']['ams-ssl-server'],
- configuration_attributes=params.config['configuration_attributes']['ams-ssl-server'],
+ configuration_attributes=params.config['configurationAttributes']['ams-ssl-server'],
owner=params.ams_user,
group=params.user_group
)
@@ -229,7 +229,7 @@ def ams(name=None, action=None):
XmlConfig( "hbase-site.xml",
conf_dir = params.ams_collector_conf_dir,
configurations = merged_ams_hbase_site,
- configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
+ configuration_attributes=params.config['configurationAttributes']['ams-hbase-site'],
owner = params.ams_user,
group = params.user_group
)
@@ -305,7 +305,7 @@ def ams(name=None, action=None):
XmlConfig("hdfs-site.xml",
conf_dir=params.ams_collector_conf_dir,
configurations=params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
@@ -314,7 +314,7 @@ def ams(name=None, action=None):
XmlConfig("hdfs-site.xml",
conf_dir=params.hbase_conf_dir,
configurations=params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
@@ -332,7 +332,7 @@ def ams(name=None, action=None):
XmlConfig("core-site.xml",
conf_dir=params.ams_collector_conf_dir,
configurations=truncated_core_site,
- configuration_attributes=params.config['configuration_attributes']['core-site'],
+ configuration_attributes=params.config['configurationAttributes']['core-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
@@ -341,7 +341,7 @@ def ams(name=None, action=None):
XmlConfig("core-site.xml",
conf_dir=params.hbase_conf_dir,
configurations=truncated_core_site,
- configuration_attributes=params.config['configuration_attributes']['core-site'],
+ configuration_attributes=params.config['configurationAttributes']['core-site'],
owner=params.ams_user,
group=params.user_group,
mode=0644
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index e20ff1d..bad7729 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -46,7 +46,7 @@ def hbase(name=None, action = None):
XmlConfig("hbase-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['ams-hbase-site'],
- configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
+ configuration_attributes=params.config['configurationAttributes']['ams-hbase-site'],
owner = params.hadoop_user
)
@@ -54,7 +54,7 @@ def hbase(name=None, action = None):
XmlConfig("hbase-policy.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['ams-hbase-policy'],
- configuration_attributes=params.config['configuration_attributes']['ams-hbase-policy'],
+ configuration_attributes=params.config['configurationAttributes']['ams-hbase-policy'],
owner = params.hadoop_user
)
# Manually overriding ownership of file installed by hadoop package
@@ -143,7 +143,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
XmlConfig("hbase-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = merged_ams_hbase_site,
- configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
+ configuration_attributes=params.config['configurationAttributes']['ams-hbase-site'],
owner = params.hbase_user,
group = params.user_group
)
@@ -163,7 +163,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
XmlConfig("hbase-policy.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['ams-hbase-policy'],
- configuration_attributes=params.config['configuration_attributes']['ams-hbase-policy'],
+ configuration_attributes=params.config['configurationAttributes']['ams-hbase-policy'],
owner = params.hbase_user,
group = params.user_group
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 919f26d..cd5b0f5 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -100,9 +100,9 @@ if not metric_truststore_alias:
metric_truststore_alias = metric_collector_host
metric_truststore_ca_certs='ca.pem'
-agent_cache_dir = config['hostLevelParams']['agentCacheDir']
-service_package_folder = config['commandParams']['service_package_folder']
-stack_name = default("/hostLevelParams/stack_name", None)
+agent_cache_dir = config['agentLevelParams']['agentCacheDir']
+service_package_folder = config['serviceLevelParams']['service_package_folder']
+stack_name = default("/clusterLevelParams/stack_name", None)
dashboards_dirs = []
# Stack specific
dashboards_dirs.append(os.path.join(agent_cache_dir, service_package_folder,
@@ -199,8 +199,8 @@ security_enabled = False if not is_hbase_distributed else config['configurations
metric_prop_file_name = "hadoop-metrics2-hbase.properties"
# not supporting 32 bit jdk.
-java64_home = config['hostLevelParams']['java_home']
-java_version = expect("/hostLevelParams/java_version", int)
+java64_home = config['ambariLevelParams']['java_home']
+java_version = expect("/ambariLevelParams/java_version", int)
metrics_collector_heapsize = default('/configurations/ams-env/metrics_collector_heapsize', "512")
metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
@@ -245,9 +245,9 @@ else:
hbase_heapsize = master_heapsize
max_open_files_limit = default("/configurations/ams-hbase-env/max_open_files_limit", "32768")
-hostname = config["hostname"]
+hostname = config['agentLevelParams']['hostname']
-cluster_zookeeper_quorum_hosts = ",".join(config['clusterHostInfo']['zookeeper_hosts'])
+cluster_zookeeper_quorum_hosts = ",".join(config['clusterHostInfo']['zookeeper_server_hosts'])
if 'zoo.cfg' in config['configurations'] and 'clientPort' in config['configurations']['zoo.cfg']:
cluster_zookeeper_clientPort = config['configurations']['zoo.cfg']['clientPort']
else:
@@ -291,7 +291,7 @@ hadoop_user = "hadoop"
kinit_cmd = ""
if security_enabled:
- _hostname_lowercase = config['hostname'].lower()
+ _hostname_lowercase = config['agentLevelParams']['hostname'].lower()
client_jaas_config_file = format("{hbase_conf_dir}/hbase_client_jaas.conf")
smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
hbase_user_keytab = config['configurations']['ams-hbase-env']['hbase_user_keytab']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
index 6057a8b..27c6020 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
@@ -41,5 +41,5 @@ security_enabled = config['configurations']['cluster-env']['security_enabled']
ams_hbase_conf_dir = format("{hbase_conf_dir}")
kinit_path_local = functions.get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
-hostname = config['hostname']
+hostname = config['agentLevelParams']['hostname']
tmp_dir = Script.get_tmp_dir()
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
index 36c4598..90b7fff 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata.py
@@ -189,7 +189,7 @@ def metadata(type='server'):
XmlConfig("hdfs-site.xml",
conf_dir=params.conf_dir,
configurations=params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner=params.metadata_user,
group=params.user_group,
mode=0644
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index d26df33..a53487f 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -86,14 +86,14 @@ stack_root = Script.get_stack_root()
# Needed since this is an Atlas Hook service.
cluster_name = config['clusterName']
-java_version = expect("/hostLevelParams/java_version", int)
+java_version = expect("/ambariLevelParams/java_version", int)
zk_root = default('/configurations/application-properties/atlas.server.ha.zookeeper.zkroot', '/apache_atlas')
stack_supports_zk_security = check_stack_feature(StackFeature.SECURE_ZOOKEEPER, version_for_stack_feature_checks)
atlas_kafka_group_id = default('/configurations/application-properties/atlas.kafka.hook.group.id', None)
if security_enabled:
- _hostname_lowercase = config['hostname'].lower()
+ _hostname_lowercase = config['agentLevelParams']['hostname'].lower()
_atlas_principal_name = config['configurations']['application-properties']['atlas.authentication.principal']
atlas_jaas_principal = _atlas_principal_name.replace('_HOST',_hostname_lowercase)
atlas_keytab_path = config['configurations']['application-properties']['atlas.authentication.keytab']
@@ -102,7 +102,7 @@ if security_enabled:
version = default("/commandParams/version", None)
# stack version
-stack_version_unformatted = config['hostLevelParams']['stack_version']
+stack_version_unformatted = config['clusterLevelParams']['stack_version']
stack_version_formatted = format_stack_version(stack_version_unformatted)
metadata_home = format('{stack_root}/current/atlas-server')
@@ -125,7 +125,7 @@ atlas_jaas_file = format("{conf_dir}/atlas_jaas.conf")
user_group = config['configurations']['cluster-env']['user_group']
# metadata env
-java64_home = config['hostLevelParams']['java_home']
+java64_home = config['ambariLevelParams']['java_home']
java_exec = format("{java64_home}/bin/java")
env_sh_template = config['configurations']['atlas-env']['content']
@@ -143,7 +143,7 @@ else:
metadata_port = http_port
metadata_protocol = 'http'
-metadata_host = config['hostname']
+metadata_host = config['agentLevelParams']['hostname']
atlas_hosts = sorted(default('/clusterHostInfo/atlas_server_hosts', []))
metadata_server_host = atlas_hosts[0] if len(atlas_hosts) > 0 else "UNKNOWN_HOST"
@@ -218,7 +218,7 @@ infra_solr_role_dev = default('configurations/infra-solr-security-json/infra_sol
infra_solr_role_ranger_audit = default('configurations/infra-solr-security-json/infra_solr_role_ranger_audit', 'ranger_audit_user')
# zookeeper
-zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts']
+zookeeper_hosts = config['clusterHostInfo']['zookeeper_server_hosts']
zookeeper_port = default('/configurations/zoo.cfg/clientPort', None)
# get comma separated lists of zookeeper hosts from clusterHostInfo
@@ -276,7 +276,7 @@ if check_stack_feature(StackFeature.ATLAS_UPGRADE_SUPPORT, version_for_stack_fea
(config['configurations']['kafka-broker']['security.inter.broker.protocol'] == "SASL_PLAINTEXT")))
if security_enabled and stack_version_formatted != "" and 'kafka_principal_name' in config['configurations']['kafka-env'] \
and check_stack_feature(StackFeature.KAFKA_KERBEROS, stack_version_formatted):
- _hostname_lowercase = config['hostname'].lower()
+ _hostname_lowercase = config['agentLevelParams']['hostname'].lower()
_kafka_principal_name = config['configurations']['kafka-env']['kafka_principal_name']
kafka_jaas_principal = _kafka_principal_name.replace('_HOST', _hostname_lowercase)
kafka_keytab_path = config['configurations']['kafka-env']['kafka_keytab']
@@ -287,7 +287,7 @@ if check_stack_feature(StackFeature.ATLAS_UPGRADE_SUPPORT, version_for_stack_fea
kafka_jaas_principal = None
kafka_keytab_path = None
-namenode_host = set(default("/clusterHostInfo/namenode_host", []))
+namenode_host = set(default("/clusterHostInfo/namenode_hosts", []))
has_namenode = not len(namenode_host) == 0
# ranger altas plugin section start
@@ -380,11 +380,11 @@ if stack_supports_atlas_ranger_plugin and enable_ranger_atlas:
ranger_plugin_properties = config['configurations']['ranger-atlas-plugin-properties']
ranger_atlas_audit = config['configurations']['ranger-atlas-audit']
- ranger_atlas_audit_attrs = config['configuration_attributes']['ranger-atlas-audit']
+ ranger_atlas_audit_attrs = config['configurationAttributes']['ranger-atlas-audit']
ranger_atlas_security = config['configurations']['ranger-atlas-security']
- ranger_atlas_security_attrs = config['configuration_attributes']['ranger-atlas-security']
+ ranger_atlas_security_attrs = config['configurationAttributes']['ranger-atlas-security']
ranger_atlas_policymgr_ssl = config['configurations']['ranger-atlas-policymgr-ssl']
- ranger_atlas_policymgr_ssl_attrs = config['configuration_attributes']['ranger-atlas-policymgr-ssl']
+ ranger_atlas_policymgr_ssl_attrs = config['configurationAttributes']['ranger-atlas-policymgr-ssl']
policy_user = config['configurations']['ranger-atlas-plugin-properties']['policy_user']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/setup_ranger_atlas.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/setup_ranger_atlas.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/setup_ranger_atlas.py
index c47c75c..b8d3fc8 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/setup_ranger_atlas.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/setup_ranger_atlas.py
@@ -56,9 +56,9 @@ def setup_ranger_atlas(upgrade_type=None):
params.policy_user, params.policymgr_mgr_url,
params.enable_ranger_atlas, conf_dict=params.conf_dir,
component_user=params.metadata_user, component_group=params.user_group, cache_service_list=['atlas'],
- plugin_audit_properties=params.config['configurations']['ranger-atlas-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-atlas-audit'],
- plugin_security_properties=params.config['configurations']['ranger-atlas-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-atlas-security'],
- plugin_policymgr_ssl_properties=params.config['configurations']['ranger-atlas-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-atlas-policymgr-ssl'],
+ plugin_audit_properties=params.config['configurations']['ranger-atlas-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-atlas-audit'],
+ plugin_security_properties=params.config['configurations']['ranger-atlas-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-atlas-security'],
+ plugin_policymgr_ssl_properties=params.config['configurations']['ranger-atlas-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-atlas-policymgr-ssl'],
component_list=['atlas-server'], audit_db_is_enabled=False,
credential_file=params.credential_file, xa_audit_db_password=None,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
index 852a9cb..68765c7 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/status_params.py
@@ -50,11 +50,11 @@ hbase_user = default("/configurations/hbase-env/hbase_user", None)
kafka_user = default("/configurations/kafka-env/kafka_user", None)
# Security related/required params
-hostname = config['hostname']
+hostname = config['agentLevelParams']['hostname']
security_enabled = default("/configurations/cluster-env/security_enabled", None)
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
hadoop_bin_dir = stack_select.get_hadoop_dir("bin")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index b1d9472..fc96821 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -45,7 +45,7 @@ config = Script.get_config()
stack_root = Script.get_stack_root()
tmp_dir = Script.get_tmp_dir()
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
# stack version
stack_version = default("/commandParams/version", None)
@@ -53,7 +53,7 @@ stack_version = default("/commandParams/version", None)
# default role to coordinator needed for service checks
component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
-hostname = config['hostname']
+hostname = config['agentLevelParams']['hostname']
# default druid parameters
druid_home = format("{stack_root}/current/{component_directory}")
@@ -83,7 +83,7 @@ druid_security_extensions_load_list = config['configurations']['druid-common']['
# status params
druid_pid_dir = status_params.druid_pid_dir
user_group = config['configurations']['cluster-env']['user_group']
-java8_home = config['hostLevelParams']['java_home']
+java8_home = config['ambariLevelParams']['java_home']
druid_env_sh_template = config['configurations']['druid-env']['content']
# log4j params
@@ -103,7 +103,7 @@ metadata_storage_db_name = config['configurations']['druid-common']['database_na
metadata_storage_db_name = config['configurations']['druid-common']['database_name']
metadata_storage_type = config['configurations']['druid-common']['druid.metadata.storage.type']
metadata_storage_url = config['configurations']['druid-common']['druid.metadata.storage.connector.connectURI']
-jdk_location = config['hostLevelParams']['jdk_location']
+jdk_location = config['ambariLevelParams']['jdk_location']
if 'mysql' == metadata_storage_type:
jdbc_driver_jar = default("/hostLevelParams/custom_mysql_jdbc_name", None)
connector_curl_source = format("{jdk_location}/{jdbc_driver_jar}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
index 2942992..0d962b2 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
@@ -25,7 +25,7 @@ if OSCheck.is_windows_family():
else:
from params_linux import *
-host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
+host_sys_prepped = default("/ambariLevelParams/host_sys_prepped", False)
# Needed since this is an Atlas Hook service.
cluster_name = config['clusterName']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
index 3773918..3031e1b 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params_linux.py
@@ -36,8 +36,8 @@ config = Script.get_config()
stack_root = status_params.stack_root
stack_name = status_params.stack_name
-agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability']
-agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count", int)
+agent_stack_retry_on_unavailability = config['ambariLevelParams']['agent_stack_retry_on_unavailability']
+agent_stack_retry_count = expect("/ambariLevelParams/agent_stack_retry_count", int)
# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade
version = default("/commandParams/version", None)
@@ -45,7 +45,7 @@ version = default("/commandParams/version", None)
stack_version_unformatted = status_params.stack_version_unformatted
stack_version_formatted = status_params.stack_version_formatted
upgrade_direction = default("/commandParams/upgrade_direction", None)
-jdk_location = config['hostLevelParams']['jdk_location']
+jdk_location = config['ambariLevelParams']['jdk_location']
# current host stack version
current_version = default("/hostLevelParams/current_version", None)
@@ -92,7 +92,7 @@ server_pid_file = status_params.server_pid_file
user_group = config['configurations']['cluster-env']['user_group']
proxyuser_group = config['configurations']['hadoop-env']['proxyuser_group']
-java_home = config['hostLevelParams']['java_home']
+java_home = config['ambariLevelParams']['java_home']
falcon_local_dir = config['configurations']['falcon-env']['falcon_local_dir']
falcon_log_dir = config['configurations']['falcon-env']['falcon_log_dir']
@@ -125,7 +125,7 @@ falcon_log4j=config['configurations']['falcon-log4j']['content']
falcon_apps_dir = config['configurations']['falcon-env']['falcon_apps_hdfs_dir']
#for create_hdfs_directory
security_enabled = config['configurations']['cluster-env']['security_enabled']
-hostname = config["hostname"]
+hostname = config['agentLevelParams']['hostname']
hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
index 0a0e370..027600c 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/status_params.py
@@ -39,7 +39,7 @@ component_directory = Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP,
config = Script.get_config()
stack_root = Script.get_stack_root()
-stack_version_unformatted = config['hostLevelParams']['stack_version']
+stack_version_unformatted = config['clusterLevelParams']['stack_version']
stack_version_formatted = format_stack_version(stack_version_unformatted)
if OSCheck.is_windows_family():
@@ -57,11 +57,11 @@ else:
falcon_conf_dir = format("{stack_root}/current/{component_directory}/conf")
# Security related/required params
- hostname = config['hostname']
+ hostname = config['agentLevelParams']['hostname']
security_enabled = config['configurations']['cluster-env']['security_enabled']
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
falcon_user = config['configurations']['falcon-env']['falcon_user']
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
index b143941..509d9de 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
@@ -33,7 +33,7 @@ else:
config = Script.get_config()
stack_root = Script.get_stack_root()
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
# New Cluster Stack Version that is defined during the RESTART of a Stack Upgrade
version = default("/commandParams/version", None)
@@ -43,11 +43,11 @@ proxyuser_group = config['configurations']['hadoop-env']['proxyuser_group']
security_enabled = config['configurations']['cluster-env']['security_enabled']
if security_enabled :
- _hostname_lowercase = config['hostname'].lower()
+ _hostname_lowercase = config['agentLevelParams']['hostname'].lower()
flume_jaas_princ = config['configurations']['flume-env']['flume_principal_name']
flume_keytab_path = config['configurations']['flume-env']['flume_keytab_path']
-stack_version_unformatted = config['hostLevelParams']['stack_version']
+stack_version_unformatted = config['clusterLevelParams']['stack_version']
stack_version_formatted = format_stack_version(stack_version_unformatted)
# hadoop default parameters
@@ -61,7 +61,7 @@ if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE,
flume_hive_home = format('{stack_root}/current/hive-metastore')
flume_hcat_home = format('{stack_root}/current/hive-webhcat')
-java_home = config['hostLevelParams']['java_home']
+java_home = config['ambariLevelParams']['java_home']
flume_log_dir = config['configurations']['flume-env']['flume_log_dir']
flume_run_dir = config['configurations']['flume-env']['flume_run_dir']
ambari_state_file = format("{flume_run_dir}/ambari-state.txt")
@@ -88,7 +88,7 @@ if 0 != len(ganglia_server_hosts):
hostname = None
if config.has_key('hostname'):
- hostname = config['hostname']
+ hostname = config['agentLevelParams']['hostname']
ams_collector_hosts = ",".join(default("/clusterHostInfo/metrics_collector_hosts", []))
has_metric_collector = not len(ams_collector_hosts) == 0
@@ -126,7 +126,7 @@ if not len(default("/clusterHostInfo/zookeeper_hosts", [])) == 0:
zookeeper_clientPort = config['configurations']['zoo.cfg']['clientPort']
else:
zookeeper_clientPort = '2181'
- zookeeper_quorum = (':' + zookeeper_clientPort + ',').join(config['clusterHostInfo']['zookeeper_hosts'])
+ zookeeper_quorum = (':' + zookeeper_clientPort + ',').join(config['clusterHostInfo']['zookeeper_server_hosts'])
# last port config
zookeeper_quorum += ':' + zookeeper_clientPort
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_linux.py
index 53b6be0..8b225ab 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params_linux.py
@@ -30,9 +30,9 @@ config = Script.get_config()
stack_root = Script.get_stack_root()
# upgrade params
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
upgrade_direction = default("/commandParams/upgrade_direction", Direction.UPGRADE)
-stack_version_unformatted = config['hostLevelParams']['stack_version']
+stack_version_unformatted = config['clusterLevelParams']['stack_version']
stack_version_formatted = format_stack_version(stack_version_unformatted)
flume_conf_dir = '/etc/flume/conf'
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
index 8473013..8cb7a0b 100644
--- a/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/GANGLIA/3.5.0/package/scripts/params.py
@@ -61,16 +61,15 @@ rrdcached_write_threads = default("/configurations/ganglia-env/rrdcached_write_t
ganglia_server_host = config["clusterHostInfo"]["ganglia_server_host"][0]
-hostname = config["hostname"]
-namenode_host = set(default("/clusterHostInfo/namenode_host", []))
+hostname = config['agentLevelParams']['hostname']
+namenode_host = set(default("/clusterHostInfo/namenode_hosts", []))
jtnode_host = set(default("/clusterHostInfo/jtnode_host", []))
-rm_host = set(default("/clusterHostInfo/rm_host", []))
-hs_host = set(default("/clusterHostInfo/hs_host", []))
+rm_host = set(default("/clusterHostInfo/resourcemanager_hosts", []))
+hs_host = set(default("/clusterHostInfo/historyserver_hosts", []))
hbase_master_hosts = set(default("/clusterHostInfo/hbase_master_hosts", []))
-# datanodes are marked as slave_hosts
-slave_hosts = set(default("/clusterHostInfo/slave_hosts", []))
+slave_hosts = set(default("/clusterHostInfo/datanode_hosts", []))
tt_hosts = set(default("/clusterHostInfo/mapred_tt_hosts", []))
-nm_hosts = set(default("/clusterHostInfo/nm_hosts", []))
+nm_hosts = set(default("/clusterHostInfo/nodemanager_hosts", []))
hbase_rs_hosts = set(default("/clusterHostInfo/hbase_rs_hosts", []))
flume_hosts = set(default("/clusterHostInfo/flume_hosts", []))
jn_hosts = set(default("/clusterHostInfo/journalnode_hosts", []))
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
index e2dbd7b..79bfd62 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/package/scripts/params.py
@@ -29,7 +29,7 @@ from resource_management.libraries.functions import get_kinit_path
from resource_management.libraries.functions.get_not_managed_resources import get_not_managed_resources
config = Script.get_config()
-config_attrs = config['configuration_attributes']
+config_attrs = config['configurationAttributes']
def __get_component_host(component):
"""
@@ -41,7 +41,7 @@ def __get_component_host(component):
return component_host
-hostname = config['hostname']
+hostname = config['agentLevelParams']['hostname']
# Users and Groups
hdfs_superuser = config['configurations']['hadoop-env']['hdfs_user']
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
index 8ad802e..4f233a4 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
@@ -38,7 +38,7 @@ def hbase(name=None):
XmlConfig("hbase-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-site'],
- configuration_attributes=params.config['configuration_attributes']['hbase-site']
+ configuration_attributes=params.config['configurationAttributes']['hbase-site']
)
if params.service_map.has_key(name):
@@ -98,7 +98,7 @@ def hbase(name=None):
XmlConfig( "hbase-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-site'],
- configuration_attributes=params.config['configuration_attributes']['hbase-site'],
+ configuration_attributes=params.config['configurationAttributes']['hbase-site'],
owner = params.hbase_user,
group = params.user_group
)
@@ -107,7 +107,7 @@ def hbase(name=None):
XmlConfig( "core-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['core-site'],
- configuration_attributes=params.config['configuration_attributes']['core-site'],
+ configuration_attributes=params.config['configurationAttributes']['core-site'],
owner = params.hbase_user,
group = params.user_group
)
@@ -115,7 +115,7 @@ def hbase(name=None):
XmlConfig( "hdfs-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner = params.hbase_user,
group = params.user_group
)
@@ -131,7 +131,7 @@ def hbase(name=None):
XmlConfig( "hbase-policy.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-policy'],
- configuration_attributes=params.config['configuration_attributes']['hbase-policy'],
+ configuration_attributes=params.config['configurationAttributes']['hbase-policy'],
owner = params.hbase_user,
group = params.user_group
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 3177643..7814f1c 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -49,8 +49,8 @@ exec_tmp_dir = Script.get_tmp_dir()
sudo = AMBARI_SUDO_BINARY
stack_name = status_params.stack_name
-agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability']
-agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count", int)
+agent_stack_retry_on_unavailability = config['ambariLevelParams']['agent_stack_retry_on_unavailability']
+agent_stack_retry_count = expect("/ambariLevelParams/agent_stack_retry_count", int)
version = default("/commandParams/version", None)
component_directory = status_params.component_directory
etc_prefix_dir = "/etc/hbase"
@@ -112,8 +112,8 @@ security_enabled = config['configurations']['cluster-env']['security_enabled']
metric_prop_file_name = "hadoop-metrics2-hbase.properties"
# not supporting 32 bit jdk.
-java64_home = config['hostLevelParams']['java_home']
-java_version = expect("/hostLevelParams/java_version", int)
+java64_home = config['ambariLevelParams']['java_home']
+java_version = expect("/ambariLevelParams/java_version", int)
log_dir = config['configurations']['hbase-env']['hbase_log_dir']
java_io_tmpdir = default("/configurations/hbase-env/hbase_java_io_tmpdir", "/tmp")
@@ -178,7 +178,7 @@ metrics_collection_period = default("/configurations/ams-site/timeline.metrics.s
# if hbase is selected the hbase_rs_hosts, should not be empty, but still default just in case
if 'slave_hosts' in config['clusterHostInfo']:
- rs_hosts = default('/clusterHostInfo/hbase_rs_hosts', '/clusterHostInfo/slave_hosts') #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves
+ rs_hosts = default('/clusterHostInfo/hbase_rs_hosts', '/clusterHostInfo/datanode_hosts') #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves
else:
rs_hosts = default('/clusterHostInfo/hbase_rs_hosts', '/clusterHostInfo/all_hosts')
@@ -189,7 +189,7 @@ service_check_data = get_unique_id_and_date()
user_group = config['configurations']['cluster-env']["user_group"]
if security_enabled:
- _hostname_lowercase = config['hostname'].lower()
+ _hostname_lowercase = config['agentLevelParams']['hostname'].lower()
master_jaas_princ = config['configurations']['hbase-site']['hbase.master.kerberos.principal'].replace('_HOST',_hostname_lowercase)
master_keytab_path = config['configurations']['hbase-site']['hbase.master.keytab.file']
regionserver_jaas_princ = config['configurations']['hbase-site']['hbase.regionserver.kerberos.principal'].replace('_HOST',_hostname_lowercase)
@@ -228,7 +228,7 @@ hbase_env_sh_template = config['configurations']['hbase-env']['content']
hbase_hdfs_root_dir = config['configurations']['hbase-site']['hbase.rootdir']
hbase_staging_dir = "/apps/hbase/staging"
#for create_hdfs_directory
-hostname = config["hostname"]
+hostname = config['agentLevelParams']['hostname']
hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name']
@@ -266,7 +266,7 @@ hadoop_security_authentication = config['configurations']['core-site']['hadoop.s
# ranger hbase plugin section start
# to get db connector jar
-jdk_location = config['hostLevelParams']['jdk_location']
+jdk_location = config['ambariLevelParams']['jdk_location']
# ranger host
ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
index d32dce1..d72cb09 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
@@ -73,9 +73,9 @@ def setup_ranger_hbase(upgrade_type=None, service_name="hbase-master"):
params.policy_user, params.policymgr_mgr_url,
params.enable_ranger_hbase, conf_dict=params.hbase_conf_dir,
component_user=params.hbase_user, component_group=params.user_group, cache_service_list=['hbaseMaster', 'hbaseRegional'],
- plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-hbase-audit'],
- plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-hbase-security'],
- plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-hbase-policymgr-ssl'],
+ plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-hbase-audit'],
+ plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-hbase-security'],
+ plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-hbase-policymgr-ssl'],
component_list=['hbase-client', 'hbase-master', 'hbase-regionserver'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password,
@@ -95,9 +95,9 @@ def setup_ranger_hbase(upgrade_type=None, service_name="hbase-master"):
params.policy_user, params.policymgr_mgr_url,
params.enable_ranger_hbase, conf_dict=params.hbase_conf_dir,
component_user=params.hbase_user, component_group=params.user_group, cache_service_list=['hbaseMaster', 'hbaseRegional'],
- plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-hbase-audit'],
- plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-hbase-security'],
- plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-hbase-policymgr-ssl'],
+ plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-hbase-audit'],
+ plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-hbase-security'],
+ plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-hbase-policymgr-ssl'],
component_list=['hbase-client', 'hbase-master', 'hbase-regionserver'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
index bc75c78..ad8501d 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/status_params.py
@@ -51,12 +51,12 @@ else:
phoenix_pid_file = format("{pid_dir}/phoenix-{hbase_user}-server.pid")
# Security related/required params
- hostname = config['hostname']
+ hostname = config['agentLevelParams']['hostname']
security_enabled = config['configurations']['cluster-env']['security_enabled']
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
- stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+ stack_version_unformatted = str(config['clusterLevelParams']['stack_version'])
stack_version_formatted = format_stack_version(stack_version_unformatted)
stack_root = Script.get_stack_root()
@@ -65,4 +65,4 @@ else:
if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
hbase_conf_dir = format("{stack_root}/current/{component_directory}/conf")
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/hbase.py
index fced4fc..f99435c 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/hbase.py
@@ -38,7 +38,7 @@ def hbase(name=None):
XmlConfig("hbase-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-site'],
- configuration_attributes=params.config['configuration_attributes']['hbase-site']
+ configuration_attributes=params.config['configurationAttributes']['hbase-site']
)
if params.service_map.has_key(name):
@@ -98,7 +98,7 @@ def hbase(name=None):
XmlConfig( "hbase-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-site'],
- configuration_attributes=params.config['configuration_attributes']['hbase-site'],
+ configuration_attributes=params.config['configurationAttributes']['hbase-site'],
owner = params.hbase_user,
group = params.user_group
)
@@ -107,7 +107,7 @@ def hbase(name=None):
XmlConfig( "core-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['core-site'],
- configuration_attributes=params.config['configuration_attributes']['core-site'],
+ configuration_attributes=params.config['configurationAttributes']['core-site'],
owner = params.hbase_user,
group = params.user_group
)
@@ -115,7 +115,7 @@ def hbase(name=None):
XmlConfig( "hdfs-site.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner = params.hbase_user,
group = params.user_group
)
@@ -131,7 +131,7 @@ def hbase(name=None):
XmlConfig( "hbase-policy.xml",
conf_dir = params.hbase_conf_dir,
configurations = params.config['configurations']['hbase-policy'],
- configuration_attributes=params.config['configuration_attributes']['hbase-policy'],
+ configuration_attributes=params.config['configurationAttributes']['hbase-policy'],
owner = params.hbase_user,
group = params.user_group
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/params_linux.py
index b7e2b89..4371753 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/params_linux.py
@@ -49,8 +49,8 @@ exec_tmp_dir = Script.get_tmp_dir()
sudo = AMBARI_SUDO_BINARY
stack_name = status_params.stack_name
-agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability']
-agent_stack_retry_count = expect("/hostLevelParams/agent_stack_retry_count", int)
+agent_stack_retry_on_unavailability = config['ambariLevelParams']['agent_stack_retry_on_unavailability']
+agent_stack_retry_count = expect("/ambariLevelParams/agent_stack_retry_count", int)
version = default("/commandParams/version", None)
component_directory = status_params.component_directory
etc_prefix_dir = "/etc/hbase"
@@ -112,8 +112,8 @@ security_enabled = config['configurations']['cluster-env']['security_enabled']
metric_prop_file_name = "hadoop-metrics2-hbase.properties"
# not supporting 32 bit jdk.
-java64_home = config['hostLevelParams']['java_home']
-java_version = expect("/hostLevelParams/java_version", int)
+java64_home = config['ambariLevelParams']['java_home']
+java_version = expect("/ambariLevelParams/java_version", int)
log_dir = config['configurations']['hbase-env']['hbase_log_dir']
java_io_tmpdir = default("/configurations/hbase-env/hbase_java_io_tmpdir", "/tmp")
@@ -173,7 +173,7 @@ metrics_collection_period = default("/configurations/ams-site/timeline.metrics.s
# if hbase is selected the hbase_rs_hosts, should not be empty, but still default just in case
if 'slave_hosts' in config['clusterHostInfo']:
- rs_hosts = default('/clusterHostInfo/hbase_rs_hosts', '/clusterHostInfo/slave_hosts') #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves
+ rs_hosts = default('/clusterHostInfo/hbase_rs_hosts', '/clusterHostInfo/datanode_hosts') #if hbase_rs_hosts not given it is assumed that region servers on same nodes as slaves
else:
rs_hosts = default('/clusterHostInfo/hbase_rs_hosts', '/clusterHostInfo/all_hosts')
@@ -184,7 +184,7 @@ service_check_data = get_unique_id_and_date()
user_group = config['configurations']['cluster-env']["user_group"]
if security_enabled:
- _hostname_lowercase = config['hostname'].lower()
+ _hostname_lowercase = config['agentLevelParams']['hostname'].lower()
master_jaas_princ = config['configurations']['hbase-site']['hbase.master.kerberos.principal'].replace('_HOST',_hostname_lowercase)
master_keytab_path = config['configurations']['hbase-site']['hbase.master.keytab.file']
regionserver_jaas_princ = config['configurations']['hbase-site']['hbase.regionserver.kerberos.principal'].replace('_HOST',_hostname_lowercase)
@@ -223,7 +223,7 @@ hbase_env_sh_template = config['configurations']['hbase-env']['content']
hbase_hdfs_root_dir = config['configurations']['hbase-site']['hbase.rootdir']
hbase_staging_dir = "/apps/hbase/staging"
#for create_hdfs_directory
-hostname = config["hostname"]
+hostname = config['agentLevelParams']['hostname']
hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name']
@@ -261,7 +261,7 @@ hadoop_security_authentication = config['configurations']['core-site']['hadoop.s
# ranger hbase plugin section start
# to get db connector jar
-jdk_location = config['hostLevelParams']['jdk_location']
+jdk_location = config['ambariLevelParams']['jdk_location']
# ranger host
ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/setup_ranger_hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/setup_ranger_hbase.py b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/setup_ranger_hbase.py
index d32dce1..d72cb09 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/setup_ranger_hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/setup_ranger_hbase.py
@@ -73,9 +73,9 @@ def setup_ranger_hbase(upgrade_type=None, service_name="hbase-master"):
params.policy_user, params.policymgr_mgr_url,
params.enable_ranger_hbase, conf_dict=params.hbase_conf_dir,
component_user=params.hbase_user, component_group=params.user_group, cache_service_list=['hbaseMaster', 'hbaseRegional'],
- plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-hbase-audit'],
- plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-hbase-security'],
- plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-hbase-policymgr-ssl'],
+ plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-hbase-audit'],
+ plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-hbase-security'],
+ plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-hbase-policymgr-ssl'],
component_list=['hbase-client', 'hbase-master', 'hbase-regionserver'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password,
@@ -95,9 +95,9 @@ def setup_ranger_hbase(upgrade_type=None, service_name="hbase-master"):
params.policy_user, params.policymgr_mgr_url,
params.enable_ranger_hbase, conf_dict=params.hbase_conf_dir,
component_user=params.hbase_user, component_group=params.user_group, cache_service_list=['hbaseMaster', 'hbaseRegional'],
- plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-hbase-audit'],
- plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-hbase-security'],
- plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-hbase-policymgr-ssl'],
+ plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-hbase-audit'],
+ plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-hbase-security'],
+ plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-hbase-policymgr-ssl'],
component_list=['hbase-client', 'hbase-master', 'hbase-regionserver'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password,
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
index bc75c78..ad8501d 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
@@ -51,12 +51,12 @@ else:
phoenix_pid_file = format("{pid_dir}/phoenix-{hbase_user}-server.pid")
# Security related/required params
- hostname = config['hostname']
+ hostname = config['agentLevelParams']['hostname']
security_enabled = config['configurations']['cluster-env']['security_enabled']
kinit_path_local = get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', None))
tmp_dir = Script.get_tmp_dir()
- stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+ stack_version_unformatted = str(config['clusterLevelParams']['stack_version'])
stack_version_formatted = format_stack_version(stack_version_unformatted)
stack_root = Script.get_stack_root()
@@ -65,4 +65,4 @@ else:
if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
hbase_conf_dir = format("{stack_root}/current/{component_directory}/conf")
-stack_name = default("/hostLevelParams/stack_name", None)
+stack_name = default("/clusterLevelParams/stack_name", None)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
index d9b62e2..559c349 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
@@ -61,7 +61,7 @@ def hdfs(name=None):
XmlConfig("hadoop-policy.xml",
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['hadoop-policy'],
- configuration_attributes=params.config['configuration_attributes']['hadoop-policy'],
+ configuration_attributes=params.config['configurationAttributes']['hadoop-policy'],
owner=params.hdfs_user,
group=params.user_group
)
@@ -70,7 +70,7 @@ def hdfs(name=None):
XmlConfig("ssl-client.xml",
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['ssl-client'],
- configuration_attributes=params.config['configuration_attributes']['ssl-client'],
+ configuration_attributes=params.config['configurationAttributes']['ssl-client'],
owner=params.hdfs_user,
group=params.user_group
)
@@ -85,7 +85,7 @@ def hdfs(name=None):
XmlConfig("ssl-client.xml",
conf_dir=params.hadoop_conf_secure_dir,
configurations=params.config['configurations']['ssl-client'],
- configuration_attributes=params.config['configuration_attributes']['ssl-client'],
+ configuration_attributes=params.config['configurationAttributes']['ssl-client'],
owner=params.hdfs_user,
group=params.user_group
)
@@ -94,7 +94,7 @@ def hdfs(name=None):
XmlConfig("ssl-server.xml",
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['ssl-server'],
- configuration_attributes=params.config['configuration_attributes']['ssl-server'],
+ configuration_attributes=params.config['configurationAttributes']['ssl-server'],
owner=params.hdfs_user,
group=params.user_group
)
@@ -102,7 +102,7 @@ def hdfs(name=None):
XmlConfig("hdfs-site.xml",
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['hdfs-site'],
- configuration_attributes=params.config['configuration_attributes']['hdfs-site'],
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site'],
owner=params.hdfs_user,
group=params.user_group
)
@@ -110,7 +110,7 @@ def hdfs(name=None):
XmlConfig("core-site.xml",
conf_dir=params.hadoop_conf_dir,
configurations=params.config['configurations']['core-site'],
- configuration_attributes=params.config['configuration_attributes']['core-site'],
+ configuration_attributes=params.config['configurationAttributes']['core-site'],
owner=params.hdfs_user,
group=params.user_group,
mode=0644
@@ -166,7 +166,7 @@ def hdfs(component=None):
configurations=params.config['configurations']['hadoop-policy'],
owner=params.hdfs_user,
mode="f",
- configuration_attributes=params.config['configuration_attributes']['hadoop-policy']
+ configuration_attributes=params.config['configurationAttributes']['hadoop-policy']
)
XmlConfig("hdfs-site.xml",
@@ -174,5 +174,5 @@ def hdfs(component=None):
configurations=params.config['configurations']['hdfs-site'],
owner=params.hdfs_user,
mode="f",
- configuration_attributes=params.config['configuration_attributes']['hdfs-site']
+ configuration_attributes=params.config['configurationAttributes']['hdfs-site']
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/9d6c7c81/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
index fe488c3..43b360d 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
@@ -27,7 +27,7 @@ else:
from resource_management.libraries.script.script import Script
_config = Script.get_config()
- stack_version_unformatted = str(_config['hostLevelParams']['stack_version'])
+ stack_version_unformatted = str(_config['clusterLevelParams']['stack_version'])
# The logic for LZO also exists in OOZIE's params.py
io_compression_codecs = default("/configurations/core-site/io.compression.codecs", None)