You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/02/25 17:07:14 UTC
ambari git commit: AMBARI-9775. Oozie failed to start in secured
cluster for stacks 2.0 and 2.1 (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 38d3e2183 -> eac740532
AMBARI-9775. Oozie failed to start in secured cluster for stacks 2.0 and 2.1 (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eac74053
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eac74053
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eac74053
Branch: refs/heads/trunk
Commit: eac74053256818c01bd9e08c5268f1a0bf895700
Parents: 38d3e21
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Feb 25 11:06:54 2015 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Feb 25 11:07:04 2015 -0500
----------------------------------------------------------------------
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
.../OOZIE/4.0.0.2.0/package/scripts/params.py | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/eac74053/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 2065f4a..172fd79 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
@@ -48,7 +48,7 @@ def oozie(is_server=False):
)
XmlConfig("oozie-site.xml",
conf_dir = params.conf_dir,
- configurations = params.config['configurations']['oozie-site'],
+ configurations = params.oozie_site,
configuration_attributes=params.config['configuration_attributes']['oozie-site'],
owner = params.oozie_user,
group = params.user_group,
http://git-wip-us.apache.org/repos/asf/ambari/blob/eac74053/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
index efe11f5..a129a6c 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params.py
@@ -36,6 +36,8 @@ import os
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
+hostname = config["hostname"]
+
# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade
version = default("/commandParams/version", None)
stack_name = default("/hostLevelParams/stack_name", None)
@@ -115,6 +117,16 @@ oozie_permsize = config['configurations']['oozie-env']['oozie_permsize']
kinit_path_local = get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
oozie_service_keytab = config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.keytab.file']
oozie_principal = config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.kerberos.principal']
+http_principal = config['configurations']['oozie-site']['oozie.authentication.kerberos.principal']
+oozie_site = config['configurations']['oozie-site']
+if security_enabled:
+ #older versions of oozie have problems when using _HOST in principal
+ oozie_site = dict(config['configurations']['oozie-site'])
+ oozie_site['oozie.service.HadoopAccessorService.kerberos.principal'] = \
+ oozie_principal.replace('_HOST', hostname)
+ oozie_site['oozie.authentication.kerberos.principal'] = \
+ http_principal.replace('_HOST', hostname)
+
smokeuser_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
oozie_keytab = default("/configurations/oozie-env/oozie_keytab", oozie_service_keytab)
oozie_env_sh_template = config['configurations']['oozie-env']['content']
@@ -163,7 +175,7 @@ if jdbc_driver_name == "org.postgresql.Driver":
else:
target = format("{oozie_libext_dir}/{jdbc_driver_jar}")
-hostname = config["hostname"]
+
ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
falcon_host = default("/clusterHostInfo/falcon_server_hosts", [])
has_falcon_host = not len(falcon_host) == 0