AMBARI-22627. Fix Stacks UT based on secured.json/default.json (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f51351e5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f51351e5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f51351e5 Branch: refs/heads/branch-3.0-perf Commit: f51351e5437d676ba4c0c7ccf70e91faac004e26 Parents: 366f6ca Author: Andrew Onishuk <[email protected]> Authored: Mon Dec 11 16:18:24 2017 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Mon Dec 11 16:18:24 2017 +0200 ---------------------------------------------------------------------- .../python/ambari_agent/HostStatusReporter.py | 3 +- .../functions/setup_ranger_plugin_xml.py | 2 +- .../libraries/script/script.py | 2 +- .../2.0.7/services/HIVE/package/scripts/hive.py | 2 +- .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 4 +- .../0.1.0/package/scripts/params_linux.py | 2 +- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 2 +- .../ATLAS/0.7.0.3.0/package/scripts/metadata.py | 2 +- .../ATLAS/0.7.0.3.0/package/scripts/params.py | 8 +- .../package/scripts/setup_ranger_atlas.py | 6 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 2 +- .../KAFKA/0.10.0.3.0/package/scripts/params.py | 8 +- .../KNOX/0.5.0.3.0/package/scripts/knox.py | 4 +- .../0.5.0.3.0/package/scripts/params_linux.py | 4 +- .../package/scripts/setup_ranger_knox.py | 14 +- .../0.5.0.3.0/package/scripts/status_params.py | 2 +- .../4.0.0.2.0/package/scripts/oozie_client.py | 2 +- .../OOZIE/4.2.0.3.0/package/scripts/oozie.py | 8 +- .../4.2.0.3.0/package/scripts/oozie_client.py | 2 +- .../4.2.0.3.0/package/scripts/status_params.py | 2 +- .../RANGER/1.0.0.3.0/package/scripts/params.py | 2 +- .../package/scripts/setup_ranger_xml.py | 16 +- .../1.0.0.3.0/package/scripts/status_params.py | 2 +- .../RANGER_KMS/1.0.0.3.0/package/scripts/kms.py | 16 +- .../1.0.0.3.0/package/scripts/params.py | 2 +- .../1.0.0.3.0/package/scripts/status_params.py | 2 +- .../SPARK/2.2.0/package/scripts/params.py | 2 +- .../1.4.4.3.0/package/scripts/params_linux.py | 2 +- .../SQOOP/1.4.4.3.0/package/scripts/sqoop.py | 2 +- .../package/scripts/setup_ranger_storm.py | 14 +- .../1.0.1.3.0/package/scripts/status_params.py | 2 +- .../0.8/hooks/after-INSTALL/scripts/params.py | 2 +- .../scripts/shared_initialization.py | 2 +- .../0.8/hooks/before-ANY/scripts/params.py | 2 +- .../0.8/hooks/before-START/scripts/params.py | 2 +- .../0.8/services/HBASE/package/scripts/hbase.py | 8 +- .../0.8/services/HDFS/package/scripts/hdfs.py | 6 +- .../0.8/services/HDFS/package/scripts/params.py | 2 +- .../0.8/services/HIVE/package/scripts/hcat.py | 2 +- .../0.8/services/HIVE/package/scripts/hive.py | 4 +- .../0.8/services/HIVE/package/scripts/params.py | 4 +- .../services/HIVE/package/scripts/webhcat.py | 2 +- .../0.8/services/OOZIE/package/scripts/oozie.py | 2 +- .../0.8/services/YARN/package/scripts/yarn.py | 12 +- .../services/YARN/package/scripts/yarn.py | 8 +- .../services/TEZ/package/scripts/tez.py | 2 +- .../services/YARN/package/scripts/yarn.py | 8 +- .../services/ECS/package/scripts/ecs_client.py | 4 +- .../services/ECS/package/scripts/params.py | 2 +- .../2.1/hooks/after-INSTALL/scripts/hook.py | 2 +- .../common-services/HAWQ/hawq_base_test_case.py | 6 +- .../common-services/HAWQ/test_hawqstandby.py | 2 +- .../test/python/common-services/PXF/test_pxf.py | 2 +- .../common-services/configs/hawq_default.json | 157 ++++++++++++- .../python/custom_actions/test_ru_set_all.py | 2 +- .../AMBARI_METRICS/test_metrics_collector.py | 18 +- .../stacks/2.0.6/HBASE/test_hbase_client.py | 12 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 20 +- .../2.0.6/HBASE/test_hbase_regionserver.py | 32 +-- .../2.0.6/HBASE/test_phoenix_queryserver.py | 20 +- .../python/stacks/2.0.6/HDFS/test_datanode.py | 16 +- .../stacks/2.0.6/HDFS/test_hdfs_client.py | 2 +- .../stacks/2.0.6/HDFS/test_journalnode.py | 8 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 14 +- .../python/stacks/2.0.6/HDFS/test_nfsgateway.py | 10 +- .../python/stacks/2.0.6/HDFS/test_snamenode.py | 8 +- .../test/python/stacks/2.0.6/HDFS/test_zkfc.py | 16 +- .../stacks/2.0.6/HIVE/test_hcat_client.py | 4 +- .../stacks/2.0.6/HIVE/test_hive_client.py | 8 +- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 2 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 8 +- .../stacks/2.0.6/HIVE/test_webhcat_server.py | 12 +- .../stacks/2.0.6/OOZIE/test_oozie_client.py | 8 +- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 14 +- .../2.0.6/OOZIE/test_oozie_service_check.py | 2 +- .../python/stacks/2.0.6/PIG/test_pig_client.py | 2 +- .../python/stacks/2.0.6/SQOOP/test_sqoop.py | 4 +- .../stacks/2.0.6/YARN/test_historyserver.py | 30 +-- .../stacks/2.0.6/YARN/test_mapreduce2_client.py | 28 +-- .../stacks/2.0.6/YARN/test_nodemanager.py | 28 +-- .../stacks/2.0.6/YARN/test_resourcemanager.py | 28 +-- .../stacks/2.0.6/YARN/test_yarn_client.py | 42 ++-- .../stacks/2.0.6/configs/client-upgrade.json | 173 +++++++++++--- .../python/stacks/2.0.6/configs/default.json | 223 ++++++++++++++----- .../python/stacks/2.0.6/configs/secured.json | 215 ++++++++++++++---- .../hooks/after-INSTALL/test_after_install.py | 18 +- .../stacks/2.1/HIVE/test_hive_metastore.py | 6 +- .../python/stacks/2.1/TEZ/test_tez_client.py | 2 +- .../stacks/2.1/YARN/test_apptimelineserver.py | 14 +- .../stacks/2.1/configs/client-upgrade.json | 174 ++++++++++++--- .../test/python/stacks/2.1/configs/default.json | 210 +++++++++++++---- .../test/python/stacks/2.1/configs/secured.json | 216 ++++++++++++++---- .../python/stacks/2.2/KNOX/test_knox_gateway.py | 4 +- .../stacks/2.3/MAHOUT/test_mahout_client.py | 4 +- .../stacks/2.5/RANGER/test_ranger_admin.py | 8 +- .../stacks/2.5/RANGER/test_ranger_tagsync.py | 4 +- .../stacks/2.5/RANGER/test_ranger_usersync.py | 4 +- .../stacks/2.5/RANGER_KMS/test_kms_server.py | 26 +-- .../stacks/2.6/RANGER/test_ranger_admin.py | 8 +- .../stacks/2.6/RANGER/test_ranger_tagsync.py | 6 +- .../HIVE/0.11.0.2.0.5.0/package/scripts/hive.py | 2 +- .../dummy_stack/HIVE/package/scripts/hive.py | 2 +- 102 files changed, 1493 insertions(+), 610 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-agent/src/main/python/ambari_agent/HostStatusReporter.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/HostStatusReporter.py b/ambari-agent/src/main/python/ambari_agent/HostStatusReporter.py index c27ee55..3de79fe 100644 --- a/ambari-agent/src/main/python/ambari_agent/HostStatusReporter.py +++ b/ambari-agent/src/main/python/ambari_agent/HostStatusReporter.py @@ -38,6 +38,7 @@ class HostStatusReporter(threading.Thread): self.config = initializer_module.config self.host_info = HostInfo(initializer_module.config) self.last_report = {} + self.hardware = Hardware(config=initializer_module.config, cache_info=False) threading.Thread.__init__(self) def run(self): @@ -68,7 +69,7 @@ class HostStatusReporter(threading.Thread): report = { 'agentEnv': host_info_dict, - 'mounts': Hardware.osdisks(self.config), + 'mounts': self.hardware.osdisks(), } return report \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py index 485c1a6..83dcc44 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py @@ -244,7 +244,7 @@ def setup_core_site_for_required_plugins(component_user, component_group, create XmlConfig('core-site.xml', conf_dir=create_core_site_path, configurations=config['configurations']['core-site'], - configuration_attributes=config['configuration_attributes']['core-site'], + configuration_attributes=config['configurationAttributes']['core-site'], owner=component_user, group=component_group, mode=0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 2c45b16..21aeec7 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 @@ -1050,7 +1050,7 @@ class Script(object): def generate_configs_get_xml_file_content(self, filename, dict): config = self.get_config() return {'configurations':config['configurations'][dict], - 'configuration_attributes':config['configuration_attributes'][dict]} + 'configurationAttributes':config['configurationAttributes'][dict]} def generate_configs_get_xml_file_dict(self, filename, dict): config = self.get_config() http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py index f813755..1f7b94e 100644 --- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py +++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.7/services/HIVE/package/scripts/hive.py @@ -42,7 +42,7 @@ def hive(name=None): XmlConfig("hive-site.xml", conf_dir=hive_config_dir, configurations=params.config['configurations']['hive-site'], - configuration_attributes=params.config['configuration_attributes']['hive-site'], + configuration_attributes=params.config['configurationAttributes']['hive-site'], owner=params.hive_user, group=params.user_group, mode=config_file_mode http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 c0ad75f..c2b673c 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 @@ -172,7 +172,7 @@ def ams(name=None): XmlConfig("ams-site.xml", conf_dir=params.ams_monitor_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 ) @@ -396,7 +396,7 @@ def ams(name=None, action=None): XmlConfig("ams-site.xml", conf_dir=params.ams_monitor_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 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py index b6030b9..20604cf 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py @@ -38,7 +38,7 @@ rpm_version = default("/configurations/hadoop-env/rpm_version", None) ams_grafana_pid_dir = config['configurations']['ams-grafana-env']['metrics_grafana_pid_dir'] -stack_version_unformatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = config['clusterLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) major_stack_version = get_major_version(stack_version_formatted) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/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 240ecae..850e789 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 @@ -208,7 +208,7 @@ def metadata(type='server'): XmlConfig("core-site.xml", conf_dir=params.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.metadata_user, group=params.user_group, mode=0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/metadata.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/metadata.py b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/metadata.py index 36c4598..90b7fff 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/metadata.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/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/f51351e5/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py index 234da4c..2d015e8 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/params.py @@ -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') @@ -382,11 +382,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/f51351e5/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/setup_ranger_atlas.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/setup_ranger_atlas.py b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/setup_ranger_atlas.py index c47c75c..b8d3fc8 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/package/scripts/setup_ranger_atlas.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/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/f51351e5/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py index 645447d..129d5cb 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py @@ -394,7 +394,7 @@ def fill_conf_dir(component_conf_dir): XmlConfig("mapred-site.xml", conf_dir=component_conf_dir, configurations=params.config['configurations']['mapred-site'], - configuration_attributes=params.config['configuration_attributes']['mapred-site'], + configuration_attributes=params.config['configurationAttributes']['mapred-site'], owner=params.hive_user, group=params.user_group, mode=mode_identified_for_file) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py index 32ca71c..924abc1 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/params.py @@ -47,7 +47,7 @@ retryAble = default("/commandParams/command_retry_enabled", False) # Version being upgraded/downgraded to 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) upgrade_direction = default("/commandParams/upgrade_direction", None) @@ -239,11 +239,11 @@ if enable_ranger_kafka and is_supported_kafka_ranger: ranger_plugin_properties = config['configurations']['ranger-kafka-plugin-properties'] ranger_kafka_audit = config['configurations']['ranger-kafka-audit'] - ranger_kafka_audit_attrs = config['configuration_attributes']['ranger-kafka-audit'] + ranger_kafka_audit_attrs = config['configurationAttributes']['ranger-kafka-audit'] ranger_kafka_security = config['configurations']['ranger-kafka-security'] - ranger_kafka_security_attrs = config['configuration_attributes']['ranger-kafka-security'] + ranger_kafka_security_attrs = config['configurationAttributes']['ranger-kafka-security'] ranger_kafka_policymgr_ssl = config['configurations']['ranger-kafka-policymgr-ssl'] - ranger_kafka_policymgr_ssl_attrs = config['configuration_attributes']['ranger-kafka-policymgr-ssl'] + ranger_kafka_policymgr_ssl_attrs = config['configurationAttributes']['ranger-kafka-policymgr-ssl'] policy_user = config['configurations']['ranger-kafka-plugin-properties']['policy_user'] http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox.py index 34b5643..e5649ab 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/knox.py @@ -41,7 +41,7 @@ def knox(): XmlConfig("gateway-site.xml", conf_dir=params.knox_conf_dir, configurations=params.config['configurations']['gateway-site'], - configuration_attributes=params.config['configuration_attributes']['gateway-site'], + configuration_attributes=params.config['configurationAttributes']['gateway-site'], owner=params.knox_user ) @@ -105,7 +105,7 @@ def knox(): XmlConfig("gateway-site.xml", conf_dir=params.knox_conf_dir, configurations=params.config['configurations']['gateway-site'], - configuration_attributes=params.config['configuration_attributes']['gateway-site'], + configuration_attributes=params.config['configurationAttributes']['gateway-site'], owner=params.knox_user, group=params.knox_group, ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py index c4da932..69af5bd 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py @@ -53,7 +53,7 @@ version = default("/commandParams/version", None) version_formatted = format_stack_version(version) # E.g., 2.3 -stack_version_unformatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = config['clusterLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) # get the correct version to use for checking stack features @@ -108,7 +108,7 @@ if stack_version_formatted and check_stack_feature(StackFeature.ROLLING_UPGRADE, knox_group = default("/configurations/knox-env/knox_group", "knox") mode = 0644 -stack_version_unformatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = config['clusterLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) dfs_ha_enabled = False http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/setup_ranger_knox.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/setup_ranger_knox.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/setup_ranger_knox.py index c486ef7..0e565a9 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/setup_ranger_knox.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/setup_ranger_knox.py @@ -62,7 +62,7 @@ def setup_ranger_knox(upgrade_type=None): XmlConfig("hdfs-site.xml", conf_dir=params.knox_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.knox_user, group=params.knox_group, mode=0644 @@ -83,9 +83,9 @@ def setup_ranger_knox(upgrade_type=None): params.policy_user, params.policymgr_mgr_url, params.enable_ranger_knox, conf_dict=params.knox_conf_dir, component_user=params.knox_user, component_group=params.knox_group, cache_service_list=['knox'], - plugin_audit_properties=params.config['configurations']['ranger-knox-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-knox-audit'], - plugin_security_properties=params.config['configurations']['ranger-knox-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-knox-security'], - plugin_policymgr_ssl_properties=params.config['configurations']['ranger-knox-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-knox-policymgr-ssl'], + plugin_audit_properties=params.config['configurations']['ranger-knox-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-knox-audit'], + plugin_security_properties=params.config['configurations']['ranger-knox-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-knox-security'], + plugin_policymgr_ssl_properties=params.config['configurations']['ranger-knox-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-knox-policymgr-ssl'], component_list=['knox-server'], 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, @@ -104,9 +104,9 @@ def setup_ranger_knox(upgrade_type=None): params.policy_user, params.policymgr_mgr_url, params.enable_ranger_knox, conf_dict=params.knox_conf_dir, component_user=params.knox_user, component_group=params.knox_group, cache_service_list=['knox'], - plugin_audit_properties=params.config['configurations']['ranger-knox-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-knox-audit'], - plugin_security_properties=params.config['configurations']['ranger-knox-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-knox-security'], - plugin_policymgr_ssl_properties=params.config['configurations']['ranger-knox-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-knox-policymgr-ssl'], + plugin_audit_properties=params.config['configurations']['ranger-knox-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-knox-audit'], + plugin_security_properties=params.config['configurations']['ranger-knox-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-knox-security'], + plugin_policymgr_ssl_properties=params.config['configurations']['ranger-knox-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-knox-policymgr-ssl'], component_list=['knox-server'], 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/f51351e5/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py index 8b441d5..2a2697d 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/status_params.py @@ -29,7 +29,7 @@ from resource_management.libraries.functions import StackFeature 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(): http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py index 164cc91..0671da9 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_client.py @@ -66,7 +66,7 @@ class OozieClient(Script): import params config = self.get_config() return {'configurations': params.oozie_site, - 'configuration_attributes': config['configurationAttributes'][dictionary]} + 'configurationAttributes': config['configurationAttributes'][dictionary]} else: return super(OozieClient, self).generate_configs_get_xml_file_content(filename, dictionary) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie.py index 96f1f1a..885057c 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie.py @@ -63,7 +63,7 @@ def oozie(is_server=False): configurations=params.config['configurations']['oozie-site'], owner=params.oozie_user, mode='f', - configuration_attributes=params.config['configuration_attributes']['oozie-site'] + configuration_attributes=params.config['configurationAttributes']['oozie-site'] ) File(os.path.join(params.oozie_conf_dir, "oozie-env.cmd"), @@ -127,7 +127,7 @@ def oozie(is_server=False): XmlConfig("oozie-site.xml", conf_dir = params.conf_dir, configurations = params.oozie_site, - configuration_attributes=params.config['configuration_attributes']['oozie-site'], + configuration_attributes=params.config['configurationAttributes']['oozie-site'], owner = params.oozie_user, group = params.user_group, mode = 0664 @@ -304,7 +304,7 @@ def oozie_server_specific(): XmlConfig("hive-site.xml", conf_dir=params.hive_conf_dir, configurations=hive_site_config, - configuration_attributes=params.config['configuration_attributes']['hive-site'], + configuration_attributes=params.config['configurationAttributes']['hive-site'], owner=params.oozie_user, group=params.user_group, mode=0644 @@ -313,7 +313,7 @@ def oozie_server_specific(): XmlConfig( "tez-site.xml", conf_dir = params.hive_conf_dir, configurations = params.config['configurations']['tez-site'], - configuration_attributes=params.config['configuration_attributes']['tez-site'], + configuration_attributes=params.config['configurationAttributes']['tez-site'], owner = params.oozie_user, group = params.user_group, mode = 0664 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py index 6fbd66a..0671da9 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/oozie_client.py @@ -66,7 +66,7 @@ class OozieClient(Script): import params config = self.get_config() return {'configurations': params.oozie_site, - 'configuration_attributes': config['configuration_attributes'][dictionary]} + 'configurationAttributes': config['configurationAttributes'][dictionary]} else: return super(OozieClient, self).generate_configs_get_xml_file_content(filename, dictionary) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py index c559d10..b5e0d44 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/status_params.py @@ -41,7 +41,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(): http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py index 912329d..8690be6 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py @@ -48,7 +48,7 @@ stack_root = Script.get_stack_root() stack_name = default("/clusterLevelParams/stack_name", None) 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) upgrade_marker_file = format("{tmp_dir}/rangeradmin_ru.inprogress") http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py index c84ae96..99aa4b8 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/setup_ranger_xml.py @@ -208,7 +208,7 @@ def setup_ranger_admin(upgrade_type=None): XmlConfig("ranger-admin-site.xml", conf_dir=ranger_conf, configurations=ranger_admin_site_copy, - configuration_attributes=params.config['configuration_attributes']['ranger-admin-site'], + configuration_attributes=params.config['configurationAttributes']['ranger-admin-site'], owner=params.unix_user, group=params.unix_group, mode=0644) @@ -236,7 +236,7 @@ def setup_ranger_admin(upgrade_type=None): XmlConfig("hbase-site.xml", conf_dir=ranger_conf, configurations=params.config['configurations']['hbase-site'], - configuration_attributes=params.config['configuration_attributes']['hbase-site'], + configuration_attributes=params.config['configurationAttributes']['hbase-site'], owner=params.unix_user, group=params.unix_group, mode=0644 @@ -246,7 +246,7 @@ def setup_ranger_admin(upgrade_type=None): XmlConfig("hdfs-site.xml", conf_dir=ranger_conf, configurations=params.config['configurations']['hdfs-site'], - configuration_attributes=params.config['configuration_attributes']['hdfs-site'], + configuration_attributes=params.config['configurationAttributes']['hdfs-site'], owner=params.unix_user, group=params.unix_group, mode=0644 @@ -507,7 +507,7 @@ def setup_usersync(upgrade_type=None): XmlConfig("ranger-ugsync-site.xml", conf_dir=ranger_ugsync_conf, configurations=ranger_ugsync_site_copy, - configuration_attributes=params.config['configuration_attributes']['ranger-ugsync-site'], + configuration_attributes=params.config['configurationAttributes']['ranger-ugsync-site'], owner=params.unix_user, group=params.unix_group, mode=0644) @@ -608,7 +608,7 @@ def setup_tagsync(upgrade_type=None): XmlConfig("ranger-tagsync-site.xml", conf_dir=ranger_tagsync_conf, configurations=params.config['configurations']['ranger-tagsync-site'], - configuration_attributes=params.config['configuration_attributes']['ranger-tagsync-site'], + configuration_attributes=params.config['configurationAttributes']['ranger-tagsync-site'], owner=params.unix_user, group=params.unix_group, mode=0644) @@ -659,7 +659,7 @@ def create_core_site_xml(conf_dir): XmlConfig("core-site.xml", conf_dir=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.unix_user, group=params.unix_group, mode=0644 @@ -813,7 +813,7 @@ def setup_tagsync_ssl_configs(): XmlConfig("ranger-policymgr-ssl.xml", conf_dir=params.ranger_tagsync_conf, configurations=ranger_tagsync_policymgr_ssl_copy, - configuration_attributes=params.config['configuration_attributes']['ranger-tagsync-policymgr-ssl'], + configuration_attributes=params.config['configurationAttributes']['ranger-tagsync-policymgr-ssl'], owner=params.unix_user, group=params.unix_group, mode=0644) @@ -837,7 +837,7 @@ def setup_tagsync_ssl_configs(): XmlConfig("atlas-tagsync-ssl.xml", conf_dir=params.ranger_tagsync_conf, configurations=atlas_tagsync_ssl_copy, - configuration_attributes=params.config['configuration_attributes']['atlas-tagsync-ssl'], + configuration_attributes=params.config['configurationAttributes']['atlas-tagsync-ssl'], owner=params.unix_user, group=params.unix_group, mode=0644) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py index b71f8bd..7430fd7 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/status_params.py @@ -32,7 +32,7 @@ upgrade_marker_file = format("{tmp_dir}/rangeradmin_ru.inprogress") ranger_pid_dir = config['configurations']['ranger-env']['ranger_pid_dir'] tagsync_pid_file = format('{ranger_pid_dir}/tagsync.pid') stack_name = default("/clusterLevelParams/stack_name", None) -stack_version_unformatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = config['clusterLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) ranger_admin_pid_file = format('{ranger_pid_dir}/rangeradmin.pid') ranger_usersync_pid_file = format('{ranger_pid_dir}/usersync.pid') http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py index 6e4a171..f7c2b6e 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/kms.py @@ -293,7 +293,7 @@ def kms(upgrade_type=None): XmlConfig("dbks-site.xml", conf_dir=params.kms_conf_dir, configurations=dbks_site_copy, - configuration_attributes=params.config['configuration_attributes']['dbks-site'], + configuration_attributes=params.config['configurationAttributes']['dbks-site'], owner=params.kms_user, group=params.kms_group, mode=0644 @@ -310,7 +310,7 @@ def kms(upgrade_type=None): XmlConfig("ranger-kms-site.xml", conf_dir=params.kms_conf_dir, configurations=ranger_kms_site_copy, - configuration_attributes=params.config['configuration_attributes']['ranger-kms-site'], + configuration_attributes=params.config['configurationAttributes']['ranger-kms-site'], owner=params.kms_user, group=params.kms_group, mode=0644 @@ -319,7 +319,7 @@ def kms(upgrade_type=None): XmlConfig("kms-site.xml", conf_dir=params.kms_conf_dir, configurations=params.config['configurations']['kms-site'], - configuration_attributes=params.config['configuration_attributes']['kms-site'], + configuration_attributes=params.config['configurationAttributes']['kms-site'], owner=params.kms_user, group=params.kms_group, mode=0644 @@ -336,7 +336,7 @@ def kms(upgrade_type=None): XmlConfig("core-site.xml", conf_dir=params.kms_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.kms_user, group=params.kms_group, mode=0644 @@ -460,7 +460,7 @@ def enable_kms_plugin(): XmlConfig("ranger-kms-audit.xml", conf_dir=params.kms_conf_dir, configurations=plugin_audit_properties_copy, - configuration_attributes=params.config['configuration_attributes']['ranger-kms-audit'], + configuration_attributes=params.config['configurationAttributes']['ranger-kms-audit'], owner=params.kms_user, group=params.kms_group, mode=0744) @@ -468,7 +468,7 @@ def enable_kms_plugin(): XmlConfig("ranger-kms-security.xml", conf_dir=params.kms_conf_dir, configurations=params.config['configurations']['ranger-kms-security'], - configuration_attributes=params.config['configuration_attributes']['ranger-kms-security'], + configuration_attributes=params.config['configurationAttributes']['ranger-kms-security'], owner=params.kms_user, group=params.kms_group, mode=0744) @@ -484,7 +484,7 @@ def enable_kms_plugin(): XmlConfig("ranger-policymgr-ssl.xml", conf_dir=params.kms_conf_dir, configurations=ranger_kms_policymgr_ssl_copy, - configuration_attributes=params.config['configuration_attributes']['ranger-kms-policymgr-ssl'], + configuration_attributes=params.config['configurationAttributes']['ranger-kms-policymgr-ssl'], owner=params.kms_user, group=params.kms_group, mode=0744) @@ -530,7 +530,7 @@ def enable_kms_plugin(): XmlConfig("hdfs-site.xml", conf_dir=params.kms_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.kms_user, group=params.kms_group, mode=0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py index 9ef127b..0a68736 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py @@ -42,7 +42,7 @@ stack_name = default("/clusterLevelParams/stack_name", None) version = default("/commandParams/version", None) upgrade_direction = default("/commandParams/upgrade_direction", None) -stack_version_unformatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = config['clusterLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) # get the correct version to use for checking stack features http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py index f9e903d..2f6f505 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/status_params.py @@ -29,7 +29,7 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() stack_name = default("/clusterLevelParams/stack_name", None) -stack_version_unformatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = config['clusterLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) stack_supports_pid = stack_version_formatted and check_stack_feature(StackFeature.RANGER_KMS_PID_SUPPORT, stack_version_formatted) ranger_kms_pid_dir = default("/configurations/kms-env/ranger_kms_pid_dir", "/var/run/ranger_kms") http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py index a7df33a..52ba588 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/params.py @@ -52,7 +52,7 @@ tmp_dir = Script.get_tmp_dir() stack_name = status_params.stack_name 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) sysprep_skip_copy_tarballs_hdfs = get_sysprep_skip_copy_tarballs_hdfs() http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py index b29e8ef..76b3a8b 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py @@ -49,7 +49,7 @@ ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0] stack_name = default("/clusterLevelParams/stack_name", None) -stack_version_unformatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = config['clusterLevelParams']['stack_version'] stack_version_formatted = format_stack_version(stack_version_unformatted) agent_stack_retry_on_unavailability = config['hostLevelParams']['agent_stack_retry_on_unavailability'] http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop.py index 436402c..09741f3 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop.py +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/sqoop.py @@ -61,7 +61,7 @@ def sqoop(type=None): XmlConfig("sqoop-site.xml", conf_dir = params.sqoop_conf_dir, configurations = configs, - configuration_attributes=params.config['configuration_attributes']['sqoop-site'], + configuration_attributes=params.config['configurationAttributes']['sqoop-site'], owner = params.sqoop_user, group = params.user_group ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/setup_ranger_storm.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/setup_ranger_storm.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/setup_ranger_storm.py index c04496e..10162c6 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/setup_ranger_storm.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/setup_ranger_storm.py @@ -72,9 +72,9 @@ def setup_ranger_storm(upgrade_type=None): params.policy_user, params.policymgr_mgr_url, params.enable_ranger_storm, conf_dict=params.conf_dir, component_user=params.storm_user, component_group=params.user_group, cache_service_list=['storm'], - plugin_audit_properties=params.config['configurations']['ranger-storm-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-storm-audit'], - plugin_security_properties=params.config['configurations']['ranger-storm-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-storm-security'], - plugin_policymgr_ssl_properties=params.config['configurations']['ranger-storm-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-storm-policymgr-ssl'], + plugin_audit_properties=params.config['configurations']['ranger-storm-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-storm-audit'], + plugin_security_properties=params.config['configurations']['ranger-storm-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-storm-security'], + plugin_policymgr_ssl_properties=params.config['configurations']['ranger-storm-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-storm-policymgr-ssl'], component_list=['storm-client', 'storm-nimbus'], 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, @@ -93,9 +93,9 @@ def setup_ranger_storm(upgrade_type=None): params.policy_user, params.policymgr_mgr_url, params.enable_ranger_storm, conf_dict=params.conf_dir, component_user=params.storm_user, component_group=params.user_group, cache_service_list=['storm'], - plugin_audit_properties=params.config['configurations']['ranger-storm-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-storm-audit'], - plugin_security_properties=params.config['configurations']['ranger-storm-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-storm-security'], - plugin_policymgr_ssl_properties=params.config['configurations']['ranger-storm-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-storm-policymgr-ssl'], + plugin_audit_properties=params.config['configurations']['ranger-storm-audit'], plugin_audit_attributes=params.config['configurationAttributes']['ranger-storm-audit'], + plugin_security_properties=params.config['configurations']['ranger-storm-security'], plugin_security_attributes=params.config['configurationAttributes']['ranger-storm-security'], + plugin_policymgr_ssl_properties=params.config['configurations']['ranger-storm-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configurationAttributes']['ranger-storm-policymgr-ssl'], component_list=['storm-client', 'storm-nimbus'], 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, @@ -119,7 +119,7 @@ def setup_ranger_storm(upgrade_type=None): XmlConfig("hdfs-site.xml", conf_dir=site_files_create_path, configurations=params.config['configurations']['hdfs-site'], - configuration_attributes=params.config['configuration_attributes']['hdfs-site'], + configuration_attributes=params.config['configurationAttributes']['hdfs-site'], owner=params.storm_user, group=params.user_group, mode=0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py index d08880b..637e6b4 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/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 = str(config['hostLevelParams']['stack_version']) +stack_version_unformatted = str(config['clusterLevelParams']['stack_version']) stack_version_formatted = format_stack_version(stack_version_unformatted) if OSCheck.is_windows_family(): http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/params.py index dd66d58..b921de2 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/params.py @@ -45,7 +45,7 @@ hdfs_log_dir_prefix = config['configurations']['hadoop-env']['hdfs_log_dir_prefi hadoop_pid_dir_prefix = config['configurations']['hadoop-env']['hadoop_pid_dir_prefix'] hadoop_root_logger = config['configurations']['hadoop-env']['hadoop_root_logger'] -if str(config['hostLevelParams']['stack_version']).startswith('2.0') and System.get_instance().os_family != "suse": +if str(config['clusterLevelParams']['stack_version']).startswith('2.0') and System.get_instance().os_family != "suse": # deprecated rhel jsvc_path jsvc_path = "/usr/libexec/bigtop-utils" else: http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/shared_initialization.py index 8094129..a883a3e 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/after-INSTALL/scripts/shared_initialization.py @@ -32,7 +32,7 @@ def setup_config(): 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 ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-ANY/scripts/params.py index 97e560a..693b3f8 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-ANY/scripts/params.py @@ -56,7 +56,7 @@ hdfs_log_dir_prefix = config['configurations']['hadoop-env']['hdfs_log_dir_prefi hadoop_pid_dir_prefix = config['configurations']['hadoop-env']['hadoop_pid_dir_prefix'] hadoop_root_logger = config['configurations']['hadoop-env']['hadoop_root_logger'] -if str(config['hostLevelParams']['stack_version']).startswith('2.0') and System.get_instance().os_family != "suse": +if str(config['clusterLevelParams']['stack_version']).startswith('2.0') and System.get_instance().os_family != "suse": # deprecated rhel jsvc_path jsvc_path = "/usr/libexec/bigtop-utils" else: http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py index 3dca7f0..a9b5fb0 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/params.py @@ -121,7 +121,7 @@ else: #hadoop-env.sh java_home = config['hostLevelParams']['java_home'] -if str(config['hostLevelParams']['stack_version']).startswith('2.0') and System.get_instance().os_family != "suse": +if str(config['clusterLevelParams']['stack_version']).startswith('2.0') and System.get_instance().os_family != "suse": # deprecated rhel jsvc_path jsvc_path = "/usr/libexec/bigtop-utils" else: http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/package/scripts/hbase.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/package/scripts/hbase.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/package/scripts/hbase.py index 9a48a43..99deda4 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/package/scripts/hbase.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/package/scripts/hbase.py @@ -47,7 +47,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client' 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 ) @@ -55,7 +55,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client' 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 ) @@ -63,7 +63,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client' 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 ) @@ -72,7 +72,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client' 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/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs.py index 33543c4..9c5736b 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs.py @@ -52,7 +52,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 ) @@ -60,7 +60,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 ) @@ -68,7 +68,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 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py index 3a711c7..aa142bf 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/params.py @@ -221,7 +221,7 @@ hadoop_env_sh_template = config['configurations']['hadoop-env']['content'] #hadoop-env.sh java_home = config['hostLevelParams']['java_home'] -stack_version = str(config['hostLevelParams']['stack_version']) +stack_version = str(config['clusterLevelParams']['stack_version']) stack_is_champlain_or_further = not (stack_version.startswith('2.0') or stack_version.startswith('2.1')) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hcat.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hcat.py index af75d36..354450c 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hcat.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hcat.py @@ -46,7 +46,7 @@ def hcat(): XmlConfig("hive-site.xml", conf_dir=params.hive_client_conf_dir, configurations=params.config['configurations']['hive-site'], - configuration_attributes=params.config['configuration_attributes']['hive-site'], + configuration_attributes=params.config['configurationAttributes']['hive-site'], owner=params.hive_user, group=params.user_group, mode=0644) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py index 2e382ff..3a05ca2 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/hive.py @@ -48,7 +48,7 @@ def hive(name=None): XmlConfig("hive-site.xml", conf_dir=params.hive_config_dir, configurations=params.config['configurations']['hive-site'], - configuration_attributes=params.config['configuration_attributes']['hive-site'], + configuration_attributes=params.config['configurationAttributes']['hive-site'], owner=params.hive_user, group=params.user_group, mode=0644) @@ -119,7 +119,7 @@ def fill_conf_dir(component_conf_dir): XmlConfig("mapred-site.xml", conf_dir=component_conf_dir, configurations=params.config['configurations']['mapred-site'], - configuration_attributes=params.config['configuration_attributes']['mapred-site'], + configuration_attributes=params.config['configurationAttributes']['mapred-site'], owner=params.hive_user, group=params.user_group, mode=0644) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py index 1159491..7400f46 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py @@ -29,8 +29,8 @@ tmp_dir = Script.get_tmp_dir() #RPM versioning support rpm_version = default("/configurations/cluster-env/rpm_version", None) -stack_version_unformatted = str(config['hostLevelParams']['stack_version']) -stack_version_formatted = config['hostLevelParams']['stack_version'] +stack_version_unformatted = str(config['clusterLevelParams']['stack_version']) +stack_version_formatted = config['clusterLevelParams']['stack_version'] #hadoop params if rpm_version: http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/webhcat.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/webhcat.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/webhcat.py index 9a7fc0c..e108932 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/webhcat.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/webhcat.py @@ -65,7 +65,7 @@ def webhcat(): XmlConfig("webhcat-site.xml", conf_dir=params.config_dir, configurations=params.config['configurations']['webhcat-site'], - configuration_attributes=params.config['configuration_attributes']['webhcat-site'], + configuration_attributes=params.config['configurationAttributes']['webhcat-site'], owner=params.webhcat_user, group=params.user_group, ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py index db86bc1..592c52e 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/package/scripts/oozie.py @@ -39,7 +39,7 @@ def oozie(is_server=False # TODO: see if see can remove this XmlConfig( "oozie-site.xml", conf_dir = params.conf_dir, configurations = params.config['configurations']['oozie-site'], - configuration_attributes=params.config['configuration_attributes']['oozie-site'], + configuration_attributes=params.config['configurationAttributes']['oozie-site'], owner = params.oozie_user, group = params.user_group, mode = 0664 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py index 402030d..8e1c3c2 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/package/scripts/yarn.py @@ -87,7 +87,7 @@ def yarn(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 @@ -96,7 +96,7 @@ def yarn(name = None): XmlConfig("mapred-site.xml", conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['mapred-site'], - configuration_attributes=params.config['configuration_attributes']['mapred-site'], + configuration_attributes=params.config['configurationAttributes']['mapred-site'], owner=params.yarn_user, group=params.user_group, mode=0644 @@ -105,7 +105,7 @@ def yarn(name = None): XmlConfig("yarn-site.xml", conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['yarn-site'], - configuration_attributes=params.config['configuration_attributes']['yarn-site'], + configuration_attributes=params.config['configurationAttributes']['yarn-site'], owner=params.yarn_user, group=params.user_group, mode=0644 @@ -114,7 +114,7 @@ def yarn(name = None): XmlConfig("capacity-scheduler.xml", conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['capacity-scheduler'], - configuration_attributes=params.config['configuration_attributes']['capacity-scheduler'], + configuration_attributes=params.config['configurationAttributes']['capacity-scheduler'], owner=params.yarn_user, group=params.user_group, mode=0644 @@ -202,7 +202,7 @@ def yarn(name = None): XmlConfig("mapred-site.xml", conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations']['mapred-site'], - configuration_attributes=params.config['configuration_attributes']['mapred-site'], + configuration_attributes=params.config['configurationAttributes']['mapred-site'], owner=params.mapred_user, group=params.user_group ) @@ -212,7 +212,7 @@ def yarn(name = None): conf_dir=params.hadoop_conf_dir, configurations=params.config['configurations'][ 'capacity-scheduler'], - configuration_attributes=params.config['configuration_attributes']['capacity-scheduler'], + configuration_attributes=params.config['configurationAttributes']['capacity-scheduler'], owner=params.hdfs_user, group=params.user_group ) http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py index 8754605..bce5724 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/YARN/package/scripts/yarn.py @@ -89,7 +89,7 @@ def yarn(name = None): XmlConfig("core-site.xml", conf_dir=params.config_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 @@ -98,7 +98,7 @@ def yarn(name = None): XmlConfig("mapred-site.xml", conf_dir=params.config_dir, configurations=params.config['configurations']['mapred-site'], - configuration_attributes=params.config['configuration_attributes']['mapred-site'], + configuration_attributes=params.config['configurationAttributes']['mapred-site'], owner=params.yarn_user, group=params.user_group, mode=0644 @@ -107,7 +107,7 @@ def yarn(name = None): XmlConfig("yarn-site.xml", conf_dir=params.config_dir, configurations=params.config['configurations']['yarn-site'], - configuration_attributes=params.config['configuration_attributes']['yarn-site'], + configuration_attributes=params.config['configurationAttributes']['yarn-site'], owner=params.yarn_user, group=params.user_group, mode=0644 @@ -116,7 +116,7 @@ def yarn(name = None): XmlConfig("capacity-scheduler.xml", conf_dir=params.config_dir, configurations=params.config['configurations']['capacity-scheduler'], - configuration_attributes=params.config['configuration_attributes']['capacity-scheduler'], + configuration_attributes=params.config['configurationAttributes']['capacity-scheduler'], owner=params.yarn_user, group=params.user_group, mode=0644 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/package/scripts/tez.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/package/scripts/tez.py b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/package/scripts/tez.py index 0dbae0c..f7e0bf8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/package/scripts/tez.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/TEZ/package/scripts/tez.py @@ -33,7 +33,7 @@ def tez(): XmlConfig( "tez-site.xml", conf_dir = params.config_dir, configurations = params.config['configurations']['tez-site'], - configuration_attributes=params.config['configuration_attributes']['tez-site'], + configuration_attributes=params.config['configurationAttributes']['tez-site'], owner = params.tez_user, group = params.user_group, mode = 0664 http://git-wip-us.apache.org/repos/asf/ambari/blob/f51351e5/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py index fcfdcba..a9c7b3d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/scripts/yarn.py @@ -89,7 +89,7 @@ def yarn(name = None): XmlConfig("core-site.xml", conf_dir=params.config_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 @@ -98,7 +98,7 @@ def yarn(name = None): XmlConfig("mapred-site.xml", conf_dir=params.config_dir, configurations=params.config['configurations']['mapred-site'], - configuration_attributes=params.config['configuration_attributes']['mapred-site'], + configuration_attributes=params.config['configurationAttributes']['mapred-site'], owner=params.yarn_user, group=params.user_group, mode=0644 @@ -107,7 +107,7 @@ def yarn(name = None): XmlConfig("yarn-site.xml", conf_dir=params.config_dir, configurations=params.config['configurations']['yarn-site'], - configuration_attributes=params.config['configuration_attributes']['yarn-site'], + configuration_attributes=params.config['configurationAttributes']['yarn-site'], owner=params.yarn_user, group=params.user_group, mode=0644 @@ -116,7 +116,7 @@ def yarn(name = None): XmlConfig("capacity-scheduler.xml", conf_dir=params.config_dir, configurations=params.config['configurations']['capacity-scheduler'], - configuration_attributes=params.config['configuration_attributes']['capacity-scheduler'], + configuration_attributes=params.config['configurationAttributes']['capacity-scheduler'], owner=params.yarn_user, group=params.user_group, mode=0644
