You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/01/26 22:45:23 UTC
[20/50] ambari git commit: AMBARI-14763: Expose PXF principal
parameter on UI (goutamtadi via jaoki)
AMBARI-14763: Expose PXF principal parameter on UI (goutamtadi via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0776956c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0776956c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0776956c
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0776956c1a85a932ed39a7e362e368997e6e6df2
Parents: c305bc9
Author: Jun Aoki <ja...@apache.org>
Authored: Fri Jan 22 18:15:45 2016 -0800
Committer: Jun Aoki <ja...@apache.org>
Committed: Fri Jan 22 18:15:54 2016 -0800
----------------------------------------------------------------------
.../resources/common-services/PXF/3.0.0/kerberos.json | 6 ++----
.../common-services/PXF/3.0.0/package/scripts/pxf.py | 12 +++---------
2 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0776956c/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json b/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
index 0a3c3c7..026336c 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/kerberos.json
@@ -6,10 +6,9 @@
"identities": [
{
"keytab": {
- "configuration": null,
+ "configuration": "pxf-site/pxf.service.kerberos.keytab",
"file": "${keytab_dir}/pxf.service.keytab",
"group": {
- "access": "",
"name": "${cluster-env/user_group}"
},
"owner": {
@@ -19,8 +18,7 @@
},
"name": "pxf_client_pxf",
"principal": {
- "configuration": null,
- "local_username": null,
+ "configuration": "pxf-site/pxf.service.kerberos.principal",
"type": "service",
"value": "pxf/_HOST@${realm}"
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0776956c/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
index 59a8b43..9a1eaf3 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf.py
@@ -105,17 +105,11 @@ class Pxf(Script):
File('{0}/pxf-profiles.xml'.format(params.pxf_conf_dir),
content = params.config['configurations']['pxf-profiles']['content'].lstrip())
-
- if params.security_enabled:
- pxf_site_dict = dict(params.config['configurations']['pxf-site'])
- pxf_site_dict['pxf.service.kerberos.principal'] = "{0}/_HOST@{1}".format(params.pxf_user, params.realm_name)
- pxf_site = ConfigDictionary(pxf_site_dict)
- else:
- pxf_site = params.config['configurations']['pxf-site']
-
+
+ # Default_value of principal => pxf/_HOST@{realm}
XmlConfig("pxf-site.xml",
conf_dir=params.pxf_conf_dir,
- configurations=pxf_site,
+ configurations=params.config['configurations']['pxf-site'],
configuration_attributes=params.config['configuration_attributes']['pxf-site'])