ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-19337. Ambari has some spelling mistakes in YARN proxyuser properties in many places (Jay SenSharma via smohanty)
Date Tue, 17 Jan 2017 21:39:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b8ef3ad1b -> 4d44269f1


AMBARI-19337. Ambari has some spelling mistakes in YARN proxyuser properties in many places
(Jay SenSharma via smohanty)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d44269f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d44269f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d44269f

Branch: refs/heads/trunk
Commit: 4d44269f1aff07bc09cc0677bf9b626a62b93d61
Parents: b8ef3ad
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Tue Jan 17 13:35:00 2017 -0800
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Tue Jan 17 13:35:00 2017 -0800

----------------------------------------------------------------------
 .../common-services/YARN/2.1.0.2.0/kerberos.json        | 12 ++++++------
 .../common-services/YARN/3.0.0.3.0/kerberos.json        | 12 ++++++------
 .../stacks/HDP/2.2/services/YARN/kerberos.json          | 12 ++++++------
 .../stacks/HDP/2.3.ECS/services/YARN/kerberos.json      | 12 ++++++------
 .../stacks/HDP/2.3/services/YARN/kerberos.json          | 12 ++++++------
 .../stacks/HDP/2.5/services/YARN/kerberos.json          | 12 ++++++------
 .../stacks/PERF/1.0/services/YARN/kerberos.json         | 12 ++++++------
 .../stacks/2.2/configs/pig-service-check-secure.json    | 12 ++++++------
 .../kerberos/test_kerberos_descriptor_2_1_3.json        | 12 ++++++------
 .../assets/data/stacks/HDP-2.1/service_components.json  | 12 ++++++------
 ambari-web/app/data/configs/wizards/secure_mapping.js   | 12 ++++++------
 11 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
index 6b61c13..c8b5989 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
@@ -23,13 +23,13 @@
             "yarn.timeline-service.http-authentication.token.validity": "",
             "yarn.timeline-service.http-authentication.cookie.domain": "",
             "yarn.timeline-service.http-authentication.cookie.path": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
-            "yarn.resourcemanager.proxyusers.*.groups": "",
-            "yarn.resourcemanager.proxyusers.*.hosts": "",
-            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxyuser.*.groups": "",
+            "yarn.resourcemanager.proxyuser.*.hosts": "",
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
             "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
             "hadoop.registry.secure" : "true",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
index d334887..fb85e7a 100644
--- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
@@ -24,13 +24,13 @@
             "yarn.timeline-service.http-authentication.token.validity": "",
             "yarn.timeline-service.http-authentication.cookie.domain": "",
             "yarn.timeline-service.http-authentication.cookie.path": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
-            "yarn.resourcemanager.proxyusers.*.groups": "",
-            "yarn.resourcemanager.proxyusers.*.hosts": "",
-            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxyuser.*.groups": "",
+            "yarn.resourcemanager.proxyuser.*.hosts": "",
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
             "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
             "hadoop.registry.secure" : "true",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
index ad30b76..85a3221 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
@@ -23,13 +23,13 @@
             "yarn.timeline-service.http-authentication.token.validity": "",
             "yarn.timeline-service.http-authentication.cookie.domain": "",
             "yarn.timeline-service.http-authentication.cookie.path": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
-            "yarn.resourcemanager.proxyusers.*.groups": "",
-            "yarn.resourcemanager.proxyusers.*.hosts": "",
-            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxyuser.*.groups": "",
+            "yarn.resourcemanager.proxyuser.*.hosts": "",
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
             "yarn.resourcemanager.zk-state-store.parent-path": "/rmstore-secure",
             "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json
b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json
index 7977941..e27513a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json
@@ -26,13 +26,13 @@
             "yarn.timeline-service.http-authentication.token.validity": "",
             "yarn.timeline-service.http-authentication.cookie.domain": "",
             "yarn.timeline-service.http-authentication.cookie.path": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
-            "yarn.resourcemanager.proxyusers.*.groups": "",
-            "yarn.resourcemanager.proxyusers.*.hosts": "",
-            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxyuser.*.groups": "",
+            "yarn.resourcemanager.proxyuser.*.hosts": "",
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
             "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
             "hadoop.registry.secure" : "true",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
index 73addb1..bf0280b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
@@ -24,13 +24,13 @@
             "yarn.timeline-service.http-authentication.token.validity": "",
             "yarn.timeline-service.http-authentication.cookie.domain": "",
             "yarn.timeline-service.http-authentication.cookie.path": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
-            "yarn.resourcemanager.proxyusers.*.groups": "",
-            "yarn.resourcemanager.proxyusers.*.hosts": "",
-            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxyuser.*.groups": "",
+            "yarn.resourcemanager.proxyuser.*.hosts": "",
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
             "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
             "hadoop.registry.secure" : "true",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json
index d334887..fb85e7a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json
@@ -24,13 +24,13 @@
             "yarn.timeline-service.http-authentication.token.validity": "",
             "yarn.timeline-service.http-authentication.cookie.domain": "",
             "yarn.timeline-service.http-authentication.cookie.path": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
-            "yarn.resourcemanager.proxyusers.*.groups": "",
-            "yarn.resourcemanager.proxyusers.*.hosts": "",
-            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxyuser.*.groups": "",
+            "yarn.resourcemanager.proxyuser.*.hosts": "",
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
             "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
             "hadoop.registry.secure" : "true",

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json
index 7e74237..2735323 100644
--- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json
@@ -24,13 +24,13 @@
             "yarn.timeline-service.http-authentication.token.validity": "",
             "yarn.timeline-service.http-authentication.cookie.domain": "",
             "yarn.timeline-service.http-authentication.cookie.path": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
-            "yarn.resourcemanager.proxyusers.*.groups": "",
-            "yarn.resourcemanager.proxyusers.*.hosts": "",
-            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxyuser.*.groups": "",
+            "yarn.resourcemanager.proxyuser.*.hosts": "",
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
             "yarn.resourcemanager.zk-state-store.parent-path": "/rmstore-secure"
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
index f14eb52..0ac9e78 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json
@@ -402,7 +402,7 @@
             "yarn.log-aggregation-enable": "true", 
             "yarn.nodemanager.delete.debug-delay-sec": "0", 
             "yarn.timeline-service.store-class": "org.apache.hadoop.yarn.server.timeline.LeveldbTimelineStore",

-            "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "", 
+            "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
             "yarn.timeline-service.client.retry-interval-ms": "1000", 
             "hadoop.registry.zk.quorum": "c6402.ambari.apache.org:2181,c6403.ambari.apache.org:2181,c6401.ambari.apache.org:2181",

             "yarn.nodemanager.aux-services": "mapreduce_shuffle", 
@@ -424,7 +424,7 @@
             "yarn.nodemanager.resource.memory-mb": "2048", 
             "yarn.timeline-service.http-authentication.kerberos.name.rules": "", 
             "yarn.nodemanager.resource.cpu-vcores": "1", 
-            "yarn.resourcemanager.proxyusers.*.users": "", 
+            "yarn.resourcemanager.proxyuser.*.users": "",
             "yarn.timeline-service.ttl-ms": "2678400000", 
             "yarn.nodemanager.resource.percentage-physical-cpu-limit": "100", 
             "yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb": "1000", 
@@ -433,7 +433,7 @@
             "yarn.nodemanager.log.retain-seconds": "604800",
             "yarn.timeline-service.http-authentication.type": "kerberos", 
             "yarn.nodemanager.log-dirs": "/hadoop/yarn/log", 
-            "yarn.resourcemanager.proxyusers.*.groups": "", 
+            "yarn.resourcemanager.proxyuser.*.groups": "",
             "yarn.timeline-service.client.max-retries": "30", 
             "yarn.nodemanager.health-checker.interval-ms": "135000", 
             "yarn.nodemanager.admin-env": "MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX", 
@@ -445,7 +445,7 @@
             "yarn.client.nodemanager-connect.max-wait-ms": "60000", 
             "yarn.timeline-service.http-authentication.simple.anonymous.allowed": "true",

             "yarn.timeline-service.leveldb-timeline-store.start-time-read-cache-size": "10000",

-            "yarn.timeline-service.http-authentication.proxyusers.*.users": "", 
+            "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
             "yarn.timeline-service.http-authentication.signer.secret.provider": "", 
             "yarn.resourcemanager.bind-host": "0.0.0.0", 
             "yarn.http.policy": "HTTP_ONLY", 
@@ -463,7 +463,7 @@
             "hadoop.registry.rm.enabled": "false", 
             "yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms": "300000", 
             "yarn.resourcemanager.fs.state-store.retry-policy-spec": "2000, 500", 
-            "yarn.timeline-service.http-authentication.proxyusers.*.groups": "", 
+            "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
             "yarn.nodemanager.log-aggregation.compression-type": "gz", 
             "yarn.timeline-service.http-authentication.kerberos.principal": "HTTP/_HOST@EXAMPLE.COM",

             "yarn.nodemanager.log-aggregation.num-log-files-per-app": "30", 
@@ -478,7 +478,7 @@
             "yarn.resourcemanager.zk-state-store.parent-path": "/rmstore", 
             "yarn.resourcemanager.connect.retry-interval.ms": "30000", 
             "yarn.timeline-service.leveldb-timeline-store.start-time-write-cache-size": "10000",

-            "yarn.resourcemanager.proxyusers.*.hosts": ""
+            "yarn.resourcemanager.proxyuser.*.hosts": ""
         }, 
         "capacity-scheduler": {
             "yarn.scheduler.capacity.default.minimum-user-limit-percent": "100", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json
b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json
index bcc5359..3d0dc28 100644
--- a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json
+++ b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json
@@ -796,7 +796,7 @@
     }, {
       "yarn-site": {
         "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
-        "yarn.resourcemanager.proxyusers.*.users": "",
+        "yarn.resourcemanager.proxyuser.*.users": "",
         "yarn.timeline-service.http-authentication.token.validity": "",
         "yarn.admin.acl": "${yarn-env/yarn_user},dr.who",
         "yarn.timeline-service.http-authentication.kerberos.name.rules": "",
@@ -805,14 +805,14 @@
         "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
         "yarn.acl.enable": "true",
         "yarn.timeline-service.http-authentication.signer.secret.provider": "",
-        "yarn.timeline-service.http-authentication.proxyusers.*.groups": "",
-        "yarn.timeline-service.http-authentication.proxyusers.*.hosts": "",
+        "yarn.timeline-service.http-authentication.proxyuser.*.groups": "",
+        "yarn.timeline-service.http-authentication.proxyuser.*.hosts": "",
         "yarn.timeline-service.http-authentication.signature.secret": "",
         "yarn.timeline-service.http-authentication.signature.secret.file": "",
-        "yarn.resourcemanager.proxyusers.*.hosts": "",
-        "yarn.resourcemanager.proxyusers.*.groups": "",
+        "yarn.resourcemanager.proxyuser.*.hosts": "",
+        "yarn.resourcemanager.proxyuser.*.groups": "",
         "yarn.timeline-service.enabled": "true",
-        "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
+        "yarn.timeline-service.http-authentication.proxyuser.*.users": "",
         "yarn.timeline-service.http-authentication.cookie.domain": ""
       }
     }, {

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
index 147c1c0..0a8f20b 100644
--- a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json
@@ -2893,7 +2893,7 @@
             {
               "yarn-site" : {
                 "yarn.timeline-service.http-authentication.signer.secret.provider.object"
: "",
-                "yarn.resourcemanager.proxyusers.*.users" : "",
+                "yarn.resourcemanager.proxyuser.*.users" : "",
                 "yarn.timeline-service.http-authentication.token.validity" : "",
                 "yarn.timeline-service.http-authentication.kerberos.name.rules" : "",
                 "yarn.timeline-service.http-authentication.cookie.path" : "",
@@ -2901,14 +2901,14 @@
                 "yarn.resourcemanager.proxy-user-privileges.enabled" : "true",
                 "yarn.acl.enable" : "true",
                 "yarn.timeline-service.http-authentication.signer.secret.provider" : "",
-                "yarn.timeline-service.http-authentication.proxyusers.*.groups" : "",
-                "yarn.timeline-service.http-authentication.proxyusers.*.hosts" : "",
+                "yarn.timeline-service.http-authentication.proxyuser.*.groups" : "",
+                "yarn.timeline-service.http-authentication.proxyuser.*.hosts" : "",
                 "yarn.timeline-service.http-authentication.signature.secret" : "",
                 "yarn.timeline-service.http-authentication.signature.secret.file" : "",
-                "yarn.resourcemanager.proxyusers.*.hosts" : "",
-                "yarn.resourcemanager.proxyusers.*.groups" : "",
+                "yarn.resourcemanager.proxyuser.*.hosts" : "",
+                "yarn.resourcemanager.proxyuser.*.groups" : "",
                 "yarn.timeline-service.enabled" : "false",
-                "yarn.timeline-service.http-authentication.proxyusers.*.users" : "",
+                "yarn.timeline-service.http-authentication.proxyuser.*.users" : "",
                 "yarn.timeline-service.http-authentication.cookie.domain" : ""
               }
             }

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d44269f/ambari-web/app/data/configs/wizards/secure_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/configs/wizards/secure_mapping.js b/ambari-web/app/data/configs/wizards/secure_mapping.js
index 8d952e8..2d24628 100644
--- a/ambari-web/app/data/configs/wizards/secure_mapping.js
+++ b/ambari-web/app/data/configs/wizards/secure_mapping.js
@@ -854,7 +854,7 @@ var yarn22Mapping = [
     "filename": "yarn-site.xml"
   },
   {
-    "name": 'yarn.timeline-service.http-authentication.proxyusers.*.hosts',
+    "name": 'yarn.timeline-service.http-authentication.proxyuser.*.hosts',
     "value": "",
     "templateName": [],
     "foreignKey": null,
@@ -862,7 +862,7 @@ var yarn22Mapping = [
     "filename": "yarn-site.xml"
   },
   {
-    "name": 'yarn.timeline-service.http-authentication.proxyusers.*.users',
+    "name": 'yarn.timeline-service.http-authentication.proxyuser.*.users',
     "value": "",
     "serviceName": "YARN",
     "templateName": [],
@@ -870,7 +870,7 @@ var yarn22Mapping = [
     "filename": "yarn-site.xml"
   },
   {
-    "name": 'yarn.timeline-service.http-authentication.proxyusers.*.groups',
+    "name": 'yarn.timeline-service.http-authentication.proxyuser.*.groups',
     "value": "",
     "templateName": [],
     "foreignKey": null,
@@ -958,7 +958,7 @@ var yarn22Mapping = [
     "filename": "yarn-site.xml"
   },
   {
-    "name": 'yarn.resourcemanager.proxyusers.*.hosts',
+    "name": 'yarn.resourcemanager.proxyuser.*.hosts',
     "value": "",
     "templateName": [],
     "foreignKey": null,
@@ -966,7 +966,7 @@ var yarn22Mapping = [
     "filename": "yarn-site.xml"
   },
   {
-    "name": 'yarn.resourcemanager.proxyusers.*.users',
+    "name": 'yarn.resourcemanager.proxyuser.*.users',
     "value": "",
     "templateName": [],
     "foreignKey": null,
@@ -974,7 +974,7 @@ var yarn22Mapping = [
     "filename": "yarn-site.xml"
   },
   {
-    "name": 'yarn.resourcemanager.proxyusers.*.groups',
+    "name": 'yarn.resourcemanager.proxyuser.*.groups',
     "value": "",
     "templateName": [],
     "foreignKey": null,


Mime
View raw message