Repository: ambari Updated Branches: refs/heads/branch-2.5 ba96c7fe0 -> e700484e8
Revert "AMBARI-19545: Ambari-agent - In HIVE and OOZIE stack scripts, copy JCEKS file to desired location" This reverts commit 300333732a9d9d296bea104e7aec44f6b87f9173. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e700484e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e700484e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e700484e Branch: refs/heads/branch-2.5 Commit: e700484e80446174d72b3ce40295cbea4689a50a Parents: ba96c7f Author: Nahappan Somasundaram <[email protected]> Authored: Tue Jan 17 11:02:15 2017 -0800 Committer: Nahappan Somasundaram <[email protected]> Committed: Tue Jan 17 11:02:31 2017 -0800 ---------------------------------------------------------------------- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 29 +--------------- .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 36 ++------------------ 2 files changed, 3 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e700484e/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 6acaf76..4ac3f8e 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 @@ -20,7 +20,6 @@ limitations under the License. import os import glob - from urlparse import urlparse from resource_management.libraries.script.script import Script @@ -46,32 +45,7 @@ from ambari_commons.constants import SERVICE from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl from ambari_commons import OSConst -# The property name used by the hadoop credential provider -HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME = 'hadoop.security.credential.provider.path' - -# Move JCEKS provider to service specific location and update the ACL -def update_credential_provider_path(config_type, dest_provider_path): - import params - # Get the path to the provider <config_type>.jceks - if HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME in params.config['configurations'][config_type]: - provider_paths = params.config['configurations'][config_type][HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME].split(',') - for path_index in range(len(provider_paths)): - provider_path = provider_paths[path_index] - if config_type == os.path.splitext(os.path.basename(provider_path))[0]: - src_provider_path = provider_path[len('jceks://file'):] - File(dest_provider_path, - owner = params.hive_user, - group = params.user_group, - mode = 0640, - content = StaticFile(src_provider_path) - ) - provider_paths[path_index] = 'jceks://file{0}'.format(dest_provider_path) - # make a copy of the config dictionary since it is read-only - config = params.config['configurations'][config_type].copy() - config[HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME] = ','.join(provider_paths) - return config - return params.config['configurations'][config_type] @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) def hive(name=None): @@ -248,10 +222,9 @@ def hive(name=None): for conf_dir in params.hive_conf_dirs_list: fill_conf_dir(conf_dir) - hive_site_config = update_credential_provider_path('hive-site', os.path.join(params.hive_conf_dir, 'hive-site.jceks')) XmlConfig("hive-site.xml", conf_dir=params.hive_config_dir, - configurations=hive_site_config, + configurations=params.hive_site_config, configuration_attributes=params.config['configuration_attributes']['hive-site'], owner=params.hive_user, group=params.user_group, http://git-wip-us.apache.org/repos/asf/ambari/blob/e700484e/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py index 027d45a..82bb301 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py @@ -27,7 +27,6 @@ from resource_management.core.resources.system import Directory, Execute, File from resource_management.core.source import DownloadSource from resource_management.core.source import InlineTemplate from resource_management.core.source import Template -from resource_management.core.source import StaticFile from resource_management.libraries.functions.format import format from resource_management.libraries.functions.default import default from resource_management.libraries.functions import StackFeature @@ -51,33 +50,6 @@ from ambari_commons.inet_utils import download_file from resource_management.core import Logger -# The property name used by the hadoop credential provider -HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME = 'hadoop.security.credential.provider.path' - -# Move JCEKS provider to service specific locationa and update the ACL -def update_credential_provider_path(config_type, dest_provider_path): - import params - - # Get the path to the provider <config_type>.jceks - if HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME in params.config['configurations'][config_type]: - provider_paths = params.config['configurations'][config_type][HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME].split(',') - for path_index in range(len(provider_paths)): - provider_path = provider_paths[path_index] - if config_type == os.path.splitext(os.path.basename(provider_path))[0]: - src_provider_path = provider_path[len('jceks://file'):] - Logger.info('src_provider_path={0}, dest_provider_path{1}'.format(src_provider_path, dest_provider_path)) - File(dest_provider_path, - owner = params.oozie_user, - group = params.user_group, - mode = 0640, - content = StaticFile(src_provider_path) - ) - provider_paths[path_index] = 'jceks://file{0}'.format(dest_provider_path) - # make a copy of the config dictionary since it cannot be modified - config = params.config['configurations'][config_type].copy() - config[HADOOP_CREDENTIAL_PROVIDER_PROPERTY_NAME] = ','.join(provider_paths) - return config - return params.config['configurations'][config_type] @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY) def oozie(is_server=False): @@ -143,12 +115,9 @@ def oozie(is_server=False): owner = params.oozie_user, group = params.user_group ) - - oozie_site_config = update_credential_provider_path('oozie-site', os.path.join(params.conf_dir, 'oozie-site.jceks')) - XmlConfig("oozie-site.xml", conf_dir = params.conf_dir, - configurations = oozie_site_config, + configurations = params.oozie_site, configuration_attributes=params.config['configuration_attributes']['oozie-site'], owner = params.oozie_user, group = params.user_group, @@ -320,10 +289,9 @@ def oozie_server_specific(): group = params.user_group ) if 'hive-site' in params.config['configurations']: - hive_site_config = update_credential_provider_path('hive-site', os.path.join(params.hive_conf_dir, 'hive-site.jceks')) XmlConfig("hive-site.xml", conf_dir=params.hive_conf_dir, - configurations=hive_site_config, + configurations=params.config['configurations']['hive-site'], configuration_attributes=params.config['configuration_attributes']['hive-site'], owner=params.oozie_user, group=params.user_group,
