You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2017/01/17 20:18:18 UTC

[1/5] ambari git commit: AMBARI-19337. Ambari has some spelling mistakes in YARN proxyuser properties in many places (Jay SenSharma via smohanty)

Repository: ambari
Updated Branches:
  refs/heads/trunk 37baf9a1a -> c689096d1


http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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,


[2/5] ambari git commit: AMBARI-19337. Ambari has some spelling mistakes in YARN proxyuser properties in many places (Jay SenSharma via smohanty)

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json.orig
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json.orig b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json.orig
new file mode 100644
index 0000000..147c1c0
--- /dev/null
+++ b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json.orig
@@ -0,0 +1,3170 @@
+
+{
+  "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services?fields=StackServices/*,components/*,components/dependencies/Dependencies/scope,artifacts/Artifacts/artifact_name",
+  "items" : [
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/AMBARI_METRICS",
+      "StackServices" : {
+        "comments" : "A system for metrics collection that provides storage and retrieval capability for metrics collected from the cluster\n      ",
+        "custom_commands" : [ ],
+        "display_name" : "Ambari Metrics",
+        "required_services" : [
+          "ZOOKEEPER"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "AMBARI_METRICS",
+        "service_version" : "0.1.0",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "ams-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "ams-hbase-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "ams-hbase-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "ams-hbase-policy" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          },
+          "ams-hbase-security-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "ams-hbase-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "ams-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "ams-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "components" : [
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "ams-hbase-security-site/hbase.master.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${ams-env/ambari_metrics_user}",
+                    "value" : "amshbase/_HOST@${realm}"
+                  },
+                  "name" : "ams_hbase_master_hbase",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${ams-env/ambari_metrics_user}"
+                    },
+                    "file" : "${keytab_dir}/ams-hbase.master.keytab",
+                    "configuration" : "ams-hbase-security-site/hbase.master.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "ams-hbase-security-site/hbase.regionserver.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${ams-env/ambari_metrics_user}",
+                    "value" : "amshbase/_HOST@${realm}"
+                  },
+                  "name" : "ams_hbase_regionserver_hbase",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${ams-env/ambari_metrics_user}"
+                    },
+                    "file" : "${keytab_dir}/ams-hbase.regionserver.keytab",
+                    "configuration" : "ams-hbase-security-site/hbase.regionserver.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "ams-hbase-security-site/hbase.myclient.principal",
+                    "type" : "service",
+                    "local_username" : "${ams-env/ambari_metrics_user}",
+                    "value" : "amshbase/_HOST@${realm}"
+                  },
+                  "name" : "ams_collector",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${ams-env/ambari_metrics_user}"
+                    },
+                    "file" : "${keytab_dir}/ams.collector.keytab",
+                    "configuration" : "ams-hbase-security-site/hbase.myclient.keytab",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "ams-hbase-security-site/ams.zookeeper.principal",
+                    "type" : "service",
+                    "local_username" : "${ams-env/ambari_metrics_user}",
+                    "value" : "zookeeper/_HOST@${realm}"
+                  },
+                  "name" : "ams_zookeeper",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${ams-env/ambari_metrics_user}"
+                    },
+                    "file" : "${keytab_dir}/zk.service.ams.keytab",
+                    "configuration" : "ams-hbase-security-site/ams.zookeeper.keytab",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                }
+              ],
+              "configurations" : [
+                {
+                  "ams-hbase-security-site" : {
+                    "hbase.coprocessor.master.classes" : "org.apache.hadoop.hbase.security.access.AccessController",
+                    "hadoop.security.authentication" : "kerberos",
+                    "hbase.security.authentication" : "kerberos",
+                    "hbase.coprocessor.region.classes" : "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.AccessController",
+                    "hbase.security.authorization" : "true",
+                    "hbase.zookeeper.property.kerberos.removeRealmFromPrincipal" : "true",
+                    "hbase.zookeeper.property.jaasLoginRenew" : "3600000",
+                    "hbase.zookeeper.property.authProvider.1" : "org.apache.zookeeper.server.auth.SASLAuthenticationProvider",
+                    "hbase.zookeeper.property.kerberos.removeHostFromPrincipal" : "true"
+                  }
+                },
+                {
+                  "ams-hbase-site": {
+                    "zookeeper.znode.parent": "/ams-hbase-secure"
+                  }
+                }
+              ],
+              "name" : "METRICS_COLLECTOR"
+            }
+          ],
+          "identities" : [
+            {
+              "name" : "/spnego"
+            },
+            {
+              "name" : "/hdfs"
+            }
+          ],
+          "name" : "AMBARI_METRICS"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/AMBARI_METRICS/components/METRICS_COLLECTOR",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "METRICS_COLLECTOR",
+            "custom_commands" : [ ],
+            "display_name" : "Metrics Collector",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "AMBARI_METRICS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/AMBARI_METRICS/components/METRICS_COLLECTOR/dependencies/ZOOKEEPER_SERVER",
+              "Dependencies" : {
+                "component_name" : "ZOOKEEPER_SERVER",
+                "dependent_component_name" : "METRICS_COLLECTOR",
+                "dependent_service_name" : "AMBARI_METRICS",
+                "scope" : "cluster",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/AMBARI_METRICS/components/METRICS_MONITOR",
+          "StackServiceComponents" : {
+            "cardinality" : "ALL",
+            "component_category" : "SLAVE",
+            "component_name" : "METRICS_MONITOR",
+            "custom_commands" : [ ],
+            "display_name" : "Metrics Monitor",
+            "is_client" : false,
+            "is_master" : false,
+            "service_name" : "AMBARI_METRICS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "auto_deploy" : {
+            "enabled" : true
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/AMBARI_METRICS/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "AMBARI_METRICS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/AMBARI_METRICS/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "AMBARI_METRICS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON",
+      "StackServices" : {
+        "comments" : "Data management and processing platform",
+        "custom_commands" : [ ],
+        "display_name" : "Falcon",
+        "required_services" : [
+          "OOZIE"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "FALCON",
+        "service_version" : "0.5.0.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "falcon-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "falcon-runtime.properties" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "falcon-startup.properties" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "components" : [
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "falcon-startup.properties/*.falcon.service.authentication.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${falcon-env/falcon_user}",
+                    "value" : "falcon/_HOST@${realm}"
+                  },
+                  "name" : "falcon_server",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${falcon-env/falcon_user}"
+                    },
+                    "file" : "${keytab_dir}/falcon.service.keytab",
+                    "configuration" : "falcon-startup.properties/*.falcon.service.authentication.kerberos.keytab",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "falcon-startup.properties/*.falcon.http.authentication.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : "HTTP/_HOST@${realm}"
+                  },
+                  "name" : "/spnego",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : null,
+                      "name" : null
+                    },
+                    "file" : null,
+                    "configuration" : "falcon-startup.properties/*.falcon.http.authentication.kerberos.keytab",
+                    "group" : {
+                      "access" : null,
+                      "name" : null
+                    }
+                  }
+                }
+              ],
+              "name" : "FALCON_SERVER"
+            }
+          ],
+          "configurations" : [
+            {
+              "falcon-startup.properties" : {
+                "*.dfs.namenode.kerberos.principal" : "nn/_HOST@${realm}",
+                "*.falcon.http.authentication.type" : "kerberos",
+                "*.falcon.authentication.type" : "kerberos"
+              }
+            }
+          ],
+          "identities" : [
+            {
+              "name" : "/spnego"
+            },
+            {
+              "name" : "/smokeuser"
+            },
+            {
+              "name" : "/hdfs"
+            }
+          ],
+          "name" : "FALCON"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_CLIENT",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "CLIENT",
+            "component_name" : "FALCON_CLIENT",
+            "custom_commands" : [ ],
+            "display_name" : "Falcon Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "FALCON",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "FALCON_SERVER",
+            "custom_commands" : [ ],
+            "display_name" : "Falcon Server",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "FALCON",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER/dependencies/OOZIE_CLIENT",
+              "Dependencies" : {
+                "component_name" : "OOZIE_CLIENT",
+                "dependent_component_name" : "FALCON_SERVER",
+                "dependent_service_name" : "FALCON",
+                "scope" : "cluster",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/components/FALCON_SERVER/dependencies/OOZIE_SERVER",
+              "Dependencies" : {
+                "component_name" : "OOZIE_SERVER",
+                "dependent_component_name" : "FALCON_SERVER",
+                "dependent_service_name" : "FALCON",
+                "scope" : "cluster",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "FALCON",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FALCON/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "FALCON",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FLUME",
+      "StackServices" : {
+        "comments" : "A distributed service for collecting, aggregating, and moving large amounts of streaming data into HDFS",
+        "custom_commands" : [ ],
+        "display_name" : "Flume",
+        "required_services" : [
+          "HDFS"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "FLUME",
+        "service_version" : "1.4.0.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "flume-conf" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "flume-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FLUME/components/FLUME_HANDLER",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "SLAVE",
+            "component_name" : "FLUME_HANDLER",
+            "custom_commands" : [ ],
+            "display_name" : "Flume",
+            "is_client" : false,
+            "is_master" : false,
+            "service_name" : "FLUME",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/FLUME/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "FLUME",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/GANGLIA",
+      "StackServices" : {
+        "comments" : "Ganglia Metrics Collection system (<a href=\"http://oss.oetiker.ch/rrdtool/\" target=\"_blank\">RRDTool</a> will be installed too)",
+        "custom_commands" : [ ],
+        "display_name" : "Ganglia",
+        "required_services" : [ ],
+        "service_check_supported" : false,
+        "service_name" : "GANGLIA",
+        "service_version" : "3.5.0",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "ganglia-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/GANGLIA/components/GANGLIA_MONITOR",
+          "StackServiceComponents" : {
+            "cardinality" : "ALL",
+            "component_category" : "SLAVE",
+            "component_name" : "GANGLIA_MONITOR",
+            "custom_commands" : [ ],
+            "display_name" : "Ganglia Monitor",
+            "is_client" : false,
+            "is_master" : false,
+            "service_name" : "GANGLIA",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "auto_deploy" : {
+            "enabled" : true
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/GANGLIA/components/GANGLIA_SERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "GANGLIA_SERVER",
+            "custom_commands" : [ ],
+            "display_name" : "Ganglia Server",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "GANGLIA",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/GANGLIA/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "GANGLIA",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE",
+      "StackServices" : {
+        "comments" : "Non-relational distributed database and centralized service for configuration management &\n        synchronization\n      ",
+        "custom_commands" : [ ],
+        "display_name" : "HBase",
+        "required_services" : [
+          "ZOOKEEPER",
+          "HDFS"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "HBASE",
+        "service_version" : "0.98.0.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "hbase-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hbase-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hbase-policy" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          },
+          "hbase-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "components" : [
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hbase-site/hbase.regionserver.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hbase-env/hbase_user}",
+                    "value" : "hbase/_HOST@${realm}"
+                  },
+                  "name" : "hbase_regionserver_hbase",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hbase-env/hbase_user}"
+                    },
+                    "file" : "${keytab_dir}/hbase.service.keytab",
+                    "configuration" : "hbase-site/hbase.regionserver.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                }
+              ],
+              "name" : "HBASE_REGIONSERVER"
+            },
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hbase-site/hbase.master.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hbase-env/hbase_user}",
+                    "value" : "hbase/_HOST@${realm}"
+                  },
+                  "name" : "hbase_master_hbase",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hbase-env/hbase_user}"
+                    },
+                    "file" : "${keytab_dir}/hbase.service.keytab",
+                    "configuration" : "hbase-site/hbase.master.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                }
+              ],
+              "name" : "HBASE_MASTER"
+            }
+          ],
+          "configurations" : [
+            {
+              "hbase-site" : {
+                "hbase.coprocessor.master.classes" : "org.apache.hadoop.hbase.security.access.AccessController",
+                "hbase.security.authentication" : "kerberos",
+                "hbase.coprocessor.region.classes" : "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController",
+                "hbase.security.authorization" : "true",
+                "hbase.bulkload.staging.dir" : "/apps/hbase/staging",
+                "zookeeper.znode.parent" : "/hbase-secure"
+              }
+            }
+          ],
+          "identities" : [
+            {
+              "name" : "/spnego"
+            },
+            {
+              "name" : "/hdfs"
+            },
+            {
+              "principal" : {
+                "configuration" : "hbase-env/hbase_principal_name",
+                "type" : "user",
+                "local_username" : "${hbase-env/hbase_user}",
+                "value" : "${hbase-env/hbase_user}@${realm}"
+              },
+              "name" : "hbase",
+              "keytab" : {
+                "owner" : {
+                  "access" : "r",
+                  "name" : "${hbase-env/hbase_user}"
+                },
+                "file" : "${keytab_dir}/hbase.headless.keytab",
+                "configuration" : "hbase-env/hbase_user_keytab",
+                "group" : {
+                  "access" : "r",
+                  "name" : "${cluster-env/user_group}"
+                }
+              }
+            },
+            {
+              "name" : "/smokeuser"
+            }
+          ],
+          "name" : "HBASE"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_CLIENT",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "CLIENT",
+            "component_name" : "HBASE_CLIENT",
+            "custom_commands" : [ ],
+            "display_name" : "HBase Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "HBASE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_MASTER",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "MASTER",
+            "component_name" : "HBASE_MASTER",
+            "custom_commands" : [
+              "DECOMMISSION"
+            ],
+            "display_name" : "HBase Master",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "HBASE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_MASTER/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "HBASE_MASTER",
+                "dependent_service_name" : "HBASE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_MASTER/dependencies/ZOOKEEPER_SERVER",
+              "Dependencies" : {
+                "component_name" : "ZOOKEEPER_SERVER",
+                "dependent_component_name" : "HBASE_MASTER",
+                "dependent_service_name" : "HBASE",
+                "scope" : "cluster",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/components/HBASE_REGIONSERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "SLAVE",
+            "component_name" : "HBASE_REGIONSERVER",
+            "custom_commands" : [ ],
+            "display_name" : "RegionServer",
+            "is_client" : false,
+            "is_master" : false,
+            "service_name" : "HBASE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HBASE/artifacts/widgets_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "widgets_descriptor",
+            "service_name" : "HBASE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS",
+      "StackServices" : {
+        "comments" : "Apache Hadoop Distributed File System",
+        "custom_commands" : [ ],
+        "display_name" : "HDFS",
+        "required_services" : [
+          "ZOOKEEPER"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "HDFS",
+        "service_version" : "2.4.0.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "core-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          },
+          "hadoop-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hadoop-policy" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          },
+          "hdfs-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hdfs-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "auth_to_local_properties" : [
+            "core-site/hadoop.security.auth_to_local"
+          ],
+          "components" : [
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/dfs.secondary.namenode.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hadoop-env/hdfs_user}",
+                    "value" : "nn/_HOST@${realm}"
+                  },
+                  "name" : "secondary_namenode_nn",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hadoop-env/hdfs_user}"
+                    },
+                    "file" : "${keytab_dir}/nn.service.keytab",
+                    "configuration" : "hdfs-site/dfs.secondary.namenode.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/dfs.secondary.namenode.kerberos.internal.spnego.principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : null
+                  },
+                  "name" : "/spnego"
+                }
+              ],
+              "name" : "SECONDARY_NAMENODE"
+            },
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/dfs.datanode.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hadoop-env/hdfs_user}",
+                    "value" : "dn/_HOST@${realm}"
+                  },
+                  "name" : "datanode_dn",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hadoop-env/hdfs_user}"
+                    },
+                    "file" : "${keytab_dir}/dn.service.keytab",
+                    "configuration" : "hdfs-site/dfs.datanode.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                }
+              ],
+              "configurations" : [
+                {
+                  "hdfs-site" : {
+                    "dfs.datanode.address" : "0.0.0.0:1019",
+                    "dfs.datanode.http.address" : "0.0.0.0:1022"
+                  }
+                }
+              ],
+              "name" : "DATANODE"
+            },
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/nfs.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hadoop-env/hdfs_user}",
+                    "value" : "nfs/_HOST@${realm}"
+                  },
+                  "name" : "nfsgateway",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hadoop-env/hdfs_user}"
+                    },
+                    "file" : "${keytab_dir}/nfs.service.keytab",
+                    "configuration" : "hdfs-site/nfs.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                }
+              ],
+              "name" : "NFS_GATEWAY"
+            },
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/dfs.journalnode.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hadoop-env/hdfs_user}",
+                    "value" : "jn/_HOST@${realm}"
+                  },
+                  "name" : "journalnode_jn",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hadoop-env/hdfs_user}"
+                    },
+                    "file" : "${keytab_dir}/jn.service.keytab",
+                    "configuration" : "hdfs-site/dfs.journalnode.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/dfs.journalnode.kerberos.internal.spnego.principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : null
+                  },
+                  "name" : "/spnego"
+                }
+              ],
+              "name" : "JOURNALNODE"
+            },
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/dfs.namenode.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hadoop-env/hdfs_user}",
+                    "value" : "nn/_HOST@${realm}"
+                  },
+                  "name" : "namenode_nn",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hadoop-env/hdfs_user}"
+                    },
+                    "file" : "${keytab_dir}/nn.service.keytab",
+                    "configuration" : "hdfs-site/dfs.namenode.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "hdfs-site/dfs.namenode.kerberos.internal.spnego.principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : null
+                  },
+                  "name" : "/spnego"
+                }
+              ],
+              "configurations" : [
+                {
+                  "hdfs-site" : {
+                    "dfs.block.access.token.enable" : "true"
+                  }
+                }
+              ],
+              "name" : "NAMENODE"
+            }
+          ],
+          "configurations" : [
+            {
+              "core-site" : {
+                "hadoop.http.authentication.cookie.domain" : "",
+                "hadoop.security.authentication" : "kerberos",
+                "hadoop.http.authentication.signer.secret.provider.object" : "",
+                "hadoop.http.authentication.kerberos.name.rules" : "",
+                "hadoop.security.auth_to_local" : "",
+                "hadoop.http.authentication.token.validity" : "",
+                "hadoop.rpc.protection" : "authentication",
+                "hadoop.http.authentication.cookie.path" : "",
+                "hadoop.security.authorization" : "true",
+                "hadoop.http.authentication.type" : "simple",
+                "hadoop.http.authentication.signature.secret.file" : "",
+                "hadoop.http.authentication.signature.secret" : "",
+                "hadoop.http.filter.initializers" : "",
+                "hadoop.http.authentication.signer.secret.provider" : "",
+                "hadoop.proxyuser.HTTP.groups" : "${hadoop-env/proxyuser_group}"
+              }
+            }
+          ],
+          "identities" : [
+            {
+              "principal" : {
+                "configuration" : "hdfs-site/dfs.web.authentication.kerberos.principal",
+                "type" : "service",
+                "local_username" : null,
+                "value" : null
+              },
+              "name" : "/spnego",
+              "keytab" : {
+                "owner" : {
+                  "access" : null,
+                  "name" : null
+                },
+                "file" : null,
+                "configuration" : "hdfs-site/dfs.web.authentication.kerberos.keytab",
+                "group" : {
+                  "access" : null,
+                  "name" : null
+                }
+              }
+            },
+            {
+              "name" : "/smokeuser"
+            },
+            {
+              "name" : "/hdfs"
+            }
+          ],
+          "name" : "HDFS"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/DATANODE",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "SLAVE",
+            "component_name" : "DATANODE",
+            "custom_commands" : [ ],
+            "display_name" : "DataNode",
+            "is_client" : false,
+            "is_master" : false,
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/HDFS_CLIENT",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "CLIENT",
+            "component_name" : "HDFS_CLIENT",
+            "custom_commands" : [ ],
+            "display_name" : "HDFS Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/JOURNALNODE",
+          "StackServiceComponents" : {
+            "cardinality" : "0+",
+            "component_category" : "SLAVE",
+            "component_name" : "JOURNALNODE",
+            "custom_commands" : [ ],
+            "display_name" : "JournalNode",
+            "is_client" : false,
+            "is_master" : false,
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/JOURNALNODE/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "JOURNALNODE",
+                "dependent_service_name" : "HDFS",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/NAMENODE",
+          "StackServiceComponents" : {
+            "cardinality" : "1-2",
+            "component_category" : "MASTER",
+            "component_name" : "NAMENODE",
+            "custom_commands" : [
+              "DECOMMISSION",
+              "REBALANCEHDFS"
+            ],
+            "display_name" : "NameNode",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/SECONDARY_NAMENODE",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "SECONDARY_NAMENODE",
+            "custom_commands" : [ ],
+            "display_name" : "SNameNode",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/components/ZKFC",
+          "StackServiceComponents" : {
+            "cardinality" : "0+",
+            "component_category" : "SLAVE",
+            "component_name" : "ZKFC",
+            "custom_commands" : [ ],
+            "display_name" : "ZKFailoverController",
+            "is_client" : false,
+            "is_master" : false,
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HDFS/artifacts/widgets_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "widgets_descriptor",
+            "service_name" : "HDFS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE",
+      "StackServices" : {
+        "comments" : "Data warehouse system for ad-hoc queries & analysis of large datasets and table & storage management service",
+        "custom_commands" : [ ],
+        "display_name" : "Hive",
+        "required_services" : [
+          "ZOOKEEPER",
+          "YARN",
+          "TEZ"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "HIVE",
+        "service_version" : "0.13.0.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "hcat-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hive-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hive-exec-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hive-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "hive-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          },
+          "webhcat-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "webhcat-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "webhcat-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "components" : [
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hive-site/hive.server2.authentication.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hive-env/hive_user}",
+                    "value" : "hive/_HOST@${realm}"
+                  },
+                  "name" : "hive_server_hive",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hive-env/hive_user}"
+                    },
+                    "file" : "${keytab_dir}/hive.service.keytab",
+                    "configuration" : "hive-site/hive.server2.authentication.kerberos.keytab",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "hive-site/hive.server2.authentication.spnego.principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : null
+                  },
+                  "name" : "/spnego",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : null,
+                      "name" : null
+                    },
+                    "file" : null,
+                    "configuration" : "hive-site/hive.server2.authentication.spnego.keytab",
+                    "group" : {
+                      "access" : null,
+                      "name" : null
+                    }
+                  }
+                }
+              ],
+              "name" : "HIVE_SERVER"
+            },
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "hive-site/hive.metastore.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${hive-env/hive_user}",
+                    "value" : "hive/_HOST@${realm}"
+                  },
+                  "name" : "hive_metastore_hive",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${hive-env/hive_user}"
+                    },
+                    "file" : "${keytab_dir}/hive.service.keytab",
+                    "configuration" : "hive-site/hive.metastore.kerberos.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                }
+              ],
+              "name" : "HIVE_METASTORE"
+            },
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "webhcat-site/templeton.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : null
+                  },
+                  "name" : "/spnego",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : null,
+                      "name" : null
+                    },
+                    "file" : null,
+                    "configuration" : "webhcat-site/templeton.kerberos.keytab",
+                    "group" : {
+                      "access" : null,
+                      "name" : null
+                    }
+                  }
+                }
+              ],
+              "name" : "WEBHCAT_SERVER"
+            }
+          ],
+          "configurations" : [
+            {
+              "hive-site" : {
+                "hive.metastore.sasl.enabled" : "true",
+                "hive.server2.authentication" : "KERBEROS",
+                "hive.security.authorization.enabled" : "true"
+              }
+            },
+            {
+              "webhcat-site" : {
+                "templeton.hive.properties" : "hive.metastore.local=false,hive.metastore.uris=thrift://${clusterHostInfo/hive_metastore_host}:9083,hive.metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=hive/_HOST@${realm}",
+                "templeton.kerberos.secret" : "secret"
+              }
+            },
+            {
+              "core-site" : {
+                "hadoop.proxyuser.HTTP.hosts" : "${clusterHostInfo/webhcat_server_host}"
+              }
+            }
+          ],
+          "identities" : [
+            {
+              "name" : "/spnego"
+            },
+            {
+              "name" : "/smokeuser"
+            }
+          ],
+          "name" : "HIVE"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HCAT",
+          "StackServiceComponents" : {
+            "cardinality" : null,
+            "component_category" : "CLIENT",
+            "component_name" : "HCAT",
+            "custom_commands" : [ ],
+            "display_name" : "HCat Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_CLIENT",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "CLIENT",
+            "component_name" : "HIVE_CLIENT",
+            "custom_commands" : [ ],
+            "display_name" : "Hive Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_METASTORE",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "HIVE_METASTORE",
+            "custom_commands" : [ ],
+            "display_name" : "Hive Metastore",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "auto_deploy" : {
+            "enabled" : true,
+            "location" : "HIVE/HIVE_SERVER"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "HIVE_SERVER",
+            "custom_commands" : [ ],
+            "display_name" : "HiveServer2",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "Dependencies" : {
+                "component_name" : "MAPREDUCE2_CLIENT",
+                "dependent_component_name" : "HIVE_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/TEZ_CLIENT",
+              "Dependencies" : {
+                "component_name" : "TEZ_CLIENT",
+                "dependent_component_name" : "HIVE_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/YARN_CLIENT",
+              "Dependencies" : {
+                "component_name" : "YARN_CLIENT",
+                "dependent_component_name" : "HIVE_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/HIVE_SERVER/dependencies/ZOOKEEPER_SERVER",
+              "Dependencies" : {
+                "component_name" : "ZOOKEEPER_SERVER",
+                "dependent_component_name" : "HIVE_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "cluster",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/MYSQL_SERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "0-1",
+            "component_category" : "MASTER",
+            "component_name" : "MYSQL_SERVER",
+            "custom_commands" : [
+              "CLEAN"
+            ],
+            "display_name" : "MySQL Server",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "WEBHCAT_SERVER",
+            "custom_commands" : [ ],
+            "display_name" : "WebHCat Server",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "Dependencies" : {
+                "component_name" : "MAPREDUCE2_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/PIG",
+              "Dependencies" : {
+                "component_name" : "PIG",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/YARN_CLIENT",
+              "Dependencies" : {
+                "component_name" : "YARN_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_CLIENT",
+              "Dependencies" : {
+                "component_name" : "ZOOKEEPER_CLIENT",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/components/WEBHCAT_SERVER/dependencies/ZOOKEEPER_SERVER",
+              "Dependencies" : {
+                "component_name" : "ZOOKEEPER_SERVER",
+                "dependent_component_name" : "WEBHCAT_SERVER",
+                "dependent_service_name" : "HIVE",
+                "scope" : "cluster",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/HIVE/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "HIVE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/KERBEROS",
+      "StackServices" : {
+        "comments" : "A computer network authentication protocol which works on\n        the basis of 'tickets' to allow nodes communicating over a\n        non-secure network to prove their identity to one another in a\n        secure manner.\n      ",
+        "custom_commands" : [ ],
+        "display_name" : "Kerberos",
+        "required_services" : [ ],
+        "service_check_supported" : true,
+        "service_name" : "KERBEROS",
+        "service_version" : "1.10.3-10",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "kerberos-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "krb5-conf" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "components" : [
+            {
+              "name" : "KERBEROS_CLIENT"
+            }
+          ],
+          "identities" : [
+            {
+              "name" : "/smokeuser"
+            }
+          ],
+          "name" : "KERBEROS"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/KERBEROS/components/KERBEROS_CLIENT",
+          "StackServiceComponents" : {
+            "cardinality" : "ALL",
+            "component_category" : "CLIENT",
+            "component_name" : "KERBEROS_CLIENT",
+            "custom_commands" : [
+              "SET_KEYTAB",
+              "REMOVE_KEYTAB"
+            ],
+            "display_name" : "Kerberos Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "KERBEROS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "auto_deploy" : {
+            "enabled" : true
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/KERBEROS/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "KERBEROS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/KERBEROS/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "KERBEROS",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2",
+      "StackServices" : {
+        "comments" : "Apache Hadoop NextGen MapReduce (YARN)",
+        "custom_commands" : [ ],
+        "display_name" : "MapReduce2",
+        "required_services" : [
+          "YARN"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "MAPREDUCE2",
+        "service_version" : "2.1.0.2.0.6.0",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "mapred-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "mapred-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "components" : [
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "mapred-site/mapreduce.jobhistory.principal",
+                    "type" : "service",
+                    "local_username" : "${mapred-env/mapred_user}",
+                    "value" : "jhs/_HOST@${realm}"
+                  },
+                  "name" : "history_server_jhs",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${mapred-env/mapred_user}"
+                    },
+                    "file" : "${keytab_dir}/jhs.service.keytab",
+                    "configuration" : "mapred-site/mapreduce.jobhistory.keytab",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "mapred-site/mapreduce.jobhistory.webapp.spnego-principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : null
+                  },
+                  "name" : "/spnego",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : null,
+                      "name" : null
+                    },
+                    "file" : null,
+                    "configuration" : "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file",
+                    "group" : {
+                      "access" : null,
+                      "name" : null
+                    }
+                  }
+                }
+              ],
+              "name" : "HISTORYSERVER"
+            }
+          ],
+          "identities" : [
+            {
+              "name" : "/spnego"
+            },
+            {
+              "name" : "/hdfs"
+            },
+            {
+              "name" : "/smokeuser"
+            }
+          ],
+          "name" : "MAPREDUCE2"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/components/HISTORYSERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "HISTORYSERVER",
+            "custom_commands" : [ ],
+            "display_name" : "History Server",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "MAPREDUCE2",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "auto_deploy" : {
+            "enabled" : true,
+            "location" : "YARN/RESOURCEMANAGER"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/components/HISTORYSERVER/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "HISTORYSERVER",
+                "dependent_service_name" : "MAPREDUCE2",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/components/MAPREDUCE2_CLIENT",
+          "StackServiceComponents" : {
+            "cardinality" : "0+",
+            "component_category" : "CLIENT",
+            "component_name" : "MAPREDUCE2_CLIENT",
+            "custom_commands" : [ ],
+            "display_name" : "MapReduce2 Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "MAPREDUCE2",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "MAPREDUCE2",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "MAPREDUCE2",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/MAPREDUCE2/artifacts/widgets_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "widgets_descriptor",
+            "service_name" : "MAPREDUCE2",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE",
+      "StackServices" : {
+        "comments" : "System for workflow coordination and execution of Apache Hadoop jobs.  This also includes the installation of the optional Oozie Web Console which relies on and will install the <a target=\"_blank\" href=\"http://www.sencha.com/legal/open-source-faq/\">ExtJS</a> Library.\n      ",
+        "custom_commands" : [ ],
+        "display_name" : "Oozie",
+        "required_services" : [
+          "YARN"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "OOZIE",
+        "service_version" : "4.0.0.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "oozie-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "oozie-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "oozie-site" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "true"
+            }
+          }
+        },
+        "kerberos_descriptor" : {
+          "auth_to_local_properties" : [
+            "oozie-site/oozie.authentication.kerberos.name.rules"
+          ],
+          "components" : [
+            {
+              "identities" : [
+                {
+                  "principal" : {
+                    "configuration" : "oozie-site/oozie.service.HadoopAccessorService.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : "${oozie-env/oozie_user}",
+                    "value" : "oozie/_HOST@${realm}"
+                  },
+                  "name" : "oozie_server",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : "r",
+                      "name" : "${oozie-env/oozie_user}"
+                    },
+                    "file" : "${keytab_dir}/oozie.service.keytab",
+                    "configuration" : "oozie-site/oozie.service.HadoopAccessorService.keytab.file",
+                    "group" : {
+                      "access" : "",
+                      "name" : "${cluster-env/user_group}"
+                    }
+                  }
+                },
+                {
+                  "principal" : {
+                    "configuration" : "oozie-site/oozie.authentication.kerberos.principal",
+                    "type" : "service",
+                    "local_username" : null,
+                    "value" : null
+                  },
+                  "name" : "/spnego",
+                  "keytab" : {
+                    "owner" : {
+                      "access" : null,
+                      "name" : null
+                    },
+                    "file" : null,
+                    "configuration" : "oozie-site/oozie.authentication.kerberos.keytab",
+                    "group" : {
+                      "access" : null,
+                      "name" : null
+                    }
+                  }
+                }
+              ],
+              "name" : "OOZIE_SERVER"
+            }
+          ],
+          "configurations" : [
+            {
+              "oozie-site" : {
+                "oozie.service.HadoopAccessorService.kerberos.enabled" : "true",
+                "oozie.authentication.type" : "kerberos",
+                "oozie.authentication.kerberos.name.rules" : "",
+                "oozie.service.AuthorizationService.authorization.enabled" : "true",
+                "local.realm" : "${realm}"
+              }
+            }
+          ],
+          "identities" : [
+            {
+              "name" : "/spnego"
+            },
+            {
+              "name" : "/smokeuser"
+            },
+            {
+              "name" : "/hdfs"
+            }
+          ],
+          "name" : "OOZIE"
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_CLIENT",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "CLIENT",
+            "component_name" : "OOZIE_CLIENT",
+            "custom_commands" : [ ],
+            "display_name" : "Oozie Client",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "OOZIE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_CLIENT/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "OOZIE_CLIENT",
+                "dependent_service_name" : "OOZIE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_CLIENT/dependencies/MAPREDUCE2_CLIENT",
+              "Dependencies" : {
+                "component_name" : "MAPREDUCE2_CLIENT",
+                "dependent_component_name" : "OOZIE_CLIENT",
+                "dependent_service_name" : "OOZIE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER",
+          "StackServiceComponents" : {
+            "cardinality" : "1",
+            "component_category" : "MASTER",
+            "component_name" : "OOZIE_SERVER",
+            "custom_commands" : [ ],
+            "display_name" : "Oozie Server",
+            "is_client" : false,
+            "is_master" : true,
+            "service_name" : "OOZIE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "OOZIE_SERVER",
+                "dependent_service_name" : "OOZIE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER/dependencies/MAPREDUCE2_CLIENT",
+              "Dependencies" : {
+                "component_name" : "MAPREDUCE2_CLIENT",
+                "dependent_component_name" : "OOZIE_SERVER",
+                "dependent_service_name" : "OOZIE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/components/OOZIE_SERVER/dependencies/YARN_CLIENT",
+              "Dependencies" : {
+                "component_name" : "YARN_CLIENT",
+                "dependent_component_name" : "OOZIE_SERVER",
+                "dependent_service_name" : "OOZIE",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/artifacts/kerberos_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "kerberos_descriptor",
+            "service_name" : "OOZIE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        },
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/OOZIE/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "OOZIE",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/PIG",
+      "StackServices" : {
+        "comments" : "Scripting platform for analyzing large datasets",
+        "custom_commands" : [ ],
+        "display_name" : "Pig",
+        "required_services" : [
+          "YARN"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "PIG",
+        "service_version" : "0.12.1.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "pig-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "pig-log4j" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          },
+          "pig-properties" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/PIG/components/PIG",
+          "StackServiceComponents" : {
+            "cardinality" : "0+",
+            "component_category" : "CLIENT",
+            "component_name" : "PIG",
+            "custom_commands" : [ ],
+            "display_name" : "Pig",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "PIG",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [ ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/PIG/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "service_name" : "PIG",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          }
+        }
+      ]
+    },
+    {
+      "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP",
+      "StackServices" : {
+        "comments" : "Tool for transferring bulk data between Apache Hadoop and\n        structured data stores such as relational databases\n      ",
+        "custom_commands" : [ ],
+        "display_name" : "Sqoop",
+        "required_services" : [
+          "HDFS"
+        ],
+        "service_check_supported" : true,
+        "service_name" : "SQOOP",
+        "service_version" : "1.4.4.2.1",
+        "stack_name" : "HDP",
+        "stack_version" : "2.1",
+        "user_name" : null,
+        "config_types" : {
+          "sqoop-env" : {
+            "supports" : {
+              "adding_forbidden" : "false",
+              "do_not_extend" : "false",
+              "final" : "false"
+            }
+          }
+        }
+      },
+      "components" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP/components/SQOOP",
+          "StackServiceComponents" : {
+            "cardinality" : "1+",
+            "component_category" : "CLIENT",
+            "component_name" : "SQOOP",
+            "custom_commands" : [ ],
+            "display_name" : "Sqoop",
+            "is_client" : true,
+            "is_master" : false,
+            "service_name" : "SQOOP",
+            "stack_name" : "HDP",
+            "stack_version" : "2.1"
+          },
+          "dependencies" : [
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP/components/SQOOP/dependencies/HDFS_CLIENT",
+              "Dependencies" : {
+                "component_name" : "HDFS_CLIENT",
+                "dependent_component_name" : "SQOOP",
+                "dependent_service_name" : "SQOOP",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            },
+            {
+              "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP/components/SQOOP/dependencies/MAPREDUCE2_CLIENT",
+              "Dependencies" : {
+                "component_name" : "MAPREDUCE2_CLIENT",
+                "dependent_component_name" : "SQOOP",
+                "dependent_service_name" : "SQOOP",
+                "scope" : "host",
+                "stack_name" : "HDP",
+                "stack_version" : "2.1"
+              }
+            }
+          ]
+        }
+      ],
+      "artifacts" : [
+        {
+          "href" : "http://c6401.ambari.apache.org:8080/api/v1/stacks/HDP/versions/2.1/services/SQOOP/artifacts/metrics_descriptor",
+          "Artifacts" : {
+            "artifact_name" : "metrics_descriptor",
+            "servic

<TRUNCATED>

[4/5] ambari git commit: AMBARI-19337. Ambari has some spelling mistakes in YARN proxyuser properties in many places (Jay SenSharma via smohanty)

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json.orig b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json.orig
new file mode 100644
index 0000000..f14eb52
--- /dev/null
+++ b/ambari-server/src/test/python/stacks/2.2/configs/pig-service-check-secure.json.orig
@@ -0,0 +1,651 @@
+{
+    "configuration_attributes": {
+        "mapred-site": {}, 
+        "pig-env": {}, 
+        "ranger-hdfs-plugin-properties": {}, 
+        "kerberos-env": {}, 
+        "tez-site": {}, 
+        "hdfs-site": {}, 
+        "tez-env": {}, 
+        "yarn-log4j": {}, 
+        "hadoop-policy": {}, 
+        "hdfs-log4j": {}, 
+        "mapred-env": {}, 
+        "krb5-conf": {}, 
+        "pig-properties": {}, 
+        "core-site": {}, 
+        "yarn-env": {}, 
+        "hadoop-env": {}, 
+        "zookeeper-log4j": {}, 
+        "yarn-site": {}, 
+        "capacity-scheduler": {}, 
+        "zoo.cfg": {}, 
+        "zookeeper-env": {}, 
+        "pig-log4j": {}, 
+        "cluster-env": {}
+    }, 
+    "commandParams": {
+        "command_timeout": "300", 
+        "script": "scripts/service_check.py", 
+        "script_type": "PYTHON", 
+        "service_package_folder": "common-services/PIG/0.12.0.2.0/package", 
+        "hooks_folder": "HDP/2.0.6/hooks"
+    }, 
+    "roleCommand": "SERVICE_CHECK", 
+    "kerberosCommandParams": [], 
+    "clusterName": "c1", 
+    "hostname": "c6403.ambari.apache.org", 
+    "hostLevelParams": {
+        "not_managed_hdfs_path_list": "[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+        "jdk_location": "http://c6401.ambari.apache.org:8080/resources/",
+        "ambari_db_rca_password": "mapred", 
+        "java_home": "/usr/jdk64/jdk1.7.0_67",
+        "java_version": "8",
+        "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca", 
+        "jce_name": "UnlimitedJCEPolicyJDK7.zip", 
+        "oracle_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar", 
+        "stack_version": "2.2", 
+        "stack_name": "HDP", 
+        "db_name": "ambari", 
+        "ambari_db_rca_driver": "org.postgresql.Driver", 
+        "jdk_name": "jdk-7u67-linux-x64.tar.gz", 
+        "ambari_db_rca_username": "mapred", 
+        "db_driver_filename": "mysql-connector-java.jar", 
+        "agentCacheDir": "/var/lib/ambari-agent/cache", 
+        "mysql_jdbc_url": "http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar"
+    }, 
+    "commandType": "EXECUTION_COMMAND", 
+    "roleParams": {}, 
+    "serviceName": "PIG", 
+    "role": "PIG_SERVICE_CHECK", 
+    "forceRefreshConfigTags": [], 
+    "taskId": 180, 
+    "public_hostname": "c6403.ambari.apache.org", 
+    "configurations": {
+        "mapred-site": {
+            "mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020", 
+            "mapreduce.jobhistory.webapp.spnego-keytab-file": "/etc/security/keytabs/spnego.service.keytab", 
+            "mapreduce.reduce.input.buffer.percent": "0.0", 
+            "mapreduce.output.fileoutputformat.compress": "false", 
+            "mapreduce.framework.name": "yarn", 
+            "mapreduce.map.speculative": "false", 
+            "mapreduce.reduce.shuffle.merge.percent": "0.66", 
+            "yarn.app.mapreduce.am.resource.mb": "682", 
+            "mapreduce.map.java.opts": "-Xmx546m", 
+            "mapreduce.cluster.administrators": " hadoop", 
+            "mapreduce.application.classpath": "$PWD/mr-framework/hadoop/share/hadoop/mapreduce/*:$PWD/mr-framework/hadoop/share/hadoop/mapreduce/lib/*:$PWD/mr-framework/hadoop/share/hadoop/common/*:$PWD/mr-framework/hadoop/share/hadoop/common/lib/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/*:$PWD/mr-framework/hadoop/share/hadoop/yarn/lib/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/*:$PWD/mr-framework/hadoop/share/hadoop/hdfs/lib/*:/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure", 
+            "mapreduce.job.reduce.slowstart.completedmaps": "0.05", 
+            "mapreduce.application.framework.path": "/hdp/apps/${hdp.version}/mapreduce/mapreduce.tar.gz#mr-framework", 
+            "mapreduce.output.fileoutputformat.compress.type": "BLOCK", 
+            "mapreduce.reduce.speculative": "false", 
+            "mapreduce.reduce.java.opts": "-Xmx546m", 
+            "mapreduce.am.max-attempts": "2", 
+            "yarn.app.mapreduce.am.admin-command-opts": "-Dhdp.version=${hdp.version}", 
+            "mapreduce.reduce.log.level": "INFO", 
+            "mapreduce.map.sort.spill.percent": "0.7", 
+            "mapreduce.job.emit-timeline-data": "false", 
+            "mapreduce.task.io.sort.mb": "273", 
+            "mapreduce.task.timeout": "300000", 
+            "mapreduce.map.memory.mb": "682", 
+            "mapreduce.task.io.sort.factor": "100", 
+            "mapreduce.jobhistory.intermediate-done-dir": "/mr-history/tmp", 
+            "mapreduce.reduce.memory.mb": "682", 
+            "mapreduce.jobhistory.principal": "jhs/_HOST@EXAMPLE.COM", 
+            "yarn.app.mapreduce.am.log.level": "INFO", 
+            "mapreduce.map.log.level": "INFO", 
+            "mapreduce.shuffle.port": "13562", 
+            "mapreduce.reduce.shuffle.fetch.retry.timeout-ms": "30000", 
+            "mapreduce.admin.user.env": "LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64", 
+            "mapreduce.map.output.compress": "false", 
+            "yarn.app.mapreduce.am.staging-dir": "/user", 
+            "mapreduce.reduce.shuffle.parallelcopies": "30", 
+            "mapreduce.reduce.shuffle.input.buffer.percent": "0.7", 
+            "mapreduce.jobhistory.webapp.address": "c6402.ambari.apache.org:19888", 
+            "mapreduce.jobhistory.keytab": "/etc/security/keytabs/jhs.service.keytab", 
+            "mapreduce.jobhistory.done-dir": "/mr-history/done", 
+            "mapreduce.admin.reduce.child.java.opts": "-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}", 
+            "mapreduce.reduce.shuffle.fetch.retry.enabled": "1", 
+            "mapreduce.jobhistory.webapp.spnego-principal": "HTTP/_HOST@EXAMPLE.COM", 
+            "yarn.app.mapreduce.am.command-opts": "-Xmx546m -Dhdp.version=${hdp.version}", 
+            "mapreduce.reduce.shuffle.fetch.retry.interval-ms": "1000", 
+            "mapreduce.jobhistory.bind-host": "0.0.0.0", 
+            "mapreduce.admin.map.child.java.opts": "-server -XX:NewRatio=8 -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}"
+        }, 
+        "pig-env": {
+            "content": "\nJAVA_HOME={{java64_home}}\nHADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\nif [ -d \"/usr/lib/tez\" ]; then\n  PIG_OPTS=\"$PIG_OPTS -Dmapreduce.framework.name=yarn\"\nfi"
+        }, 
+        "ranger-hdfs-plugin-properties": {
+            "XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS": "900", 
+            "XAAUDIT.HDFS.DESTINATION_DIRECTORY": "hdfs://__REPLACE__NAME_NODE_HOST:8020/ranger/audit/%app-type%/%time:yyyyMMdd%", 
+            "XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY": "__REPLACE__LOG_DIR/hadoop/%app-type%/audit", 
+            "common.name.for.certificate": "-", 
+            "XAAUDIT.HDFS.IS_ENABLED": "false", 
+            "XAAUDIT.HDFS.LOCAL_BUFFER_FILE": "%time:yyyyMMdd-HHmm.ss%.log", 
+            "SSL_KEYSTORE_PASSWORD": "myKeyFilePassword", 
+            "XAAUDIT.DB.IS_ENABLED": "true", 
+            "XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS": "600", 
+            "hadoop.rpc.protection": "-", 
+            "ranger-hdfs-plugin-enabled": "No", 
+            "SSL_KEYSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-keystore.jks", 
+            "XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS": "60", 
+            "policy_user": "ambari-qa", 
+            "XAAUDIT.HDFS.DESTINTATION_FILE": "%hostname%-audit.log", 
+            "XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS": "86400", 
+            "XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT": "10", 
+            "SSL_TRUSTSTORE_PASSWORD": "changeit", 
+            "XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY": "__REPLACE__LOG_DIR/hadoop/%app-type%/audit/archive", 
+            "REPOSITORY_CONFIG_USERNAME": "hadoop", 
+            "XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS": "60", 
+            "SSL_TRUSTSTORE_FILE_PATH": "/etc/hadoop/conf/ranger-plugin-truststore.jks", 
+            "REPOSITORY_CONFIG_PASSWORD": "hadoop"
+        }, 
+        "kerberos-env": {
+            "ad_create_attributes_template": "\n{\n  \"objectClass\": [\"top\", \"person\", \"organizationalPerson\", \"user\"],\n  \"cn\": \"$principal_name\",\n  #if( $is_service )\n  \"servicePrincipalName\": \"$principal_name\",\n  #end\n  \"userPrincipalName\": \"$normalized_principal\",\n  \"unicodePwd\": \"$password\",\n  \"accountExpires\": \"0\",\n  \"userAccountControl\": \"66048\"\n}\n    ",
+            "realm": "EXAMPLE.COM", 
+            "container_dn": "", 
+            "ldap_url": "", 
+            "encryption_types": "aes des3-cbc-sha1 rc4 des-cbc-md5", 
+            "kdc_type": "mit-kdc",
+            "kdc_hosts": "c6401.ambari.apache.org",
+            "admin_server_host": "c6401.ambari.apache.org"
+        },
+        "tez-site": {
+            "tez.task.get-task.sleep.interval-ms.max": "200", 
+            "tez.task.max-events-per-heartbeat": "500", 
+            "tez.task.launch.cmd-opts": "-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC", 
+            "tez.runtime.compress": "true", 
+            "tez.runtime.io.sort.mb": "272", 
+            "tez.runtime.convert.user-payload.to.history-text": "false", 
+            "tez.generate.debug.artifacts": "false", 
+            "tez.am.tez-ui.history-url.template": "__HISTORY_URL_BASE__?viewPath=%2F%23%2Ftez-app%2F__APPLICATION_ID__", 
+            "tez.am.log.level": "INFO", 
+            "tez.counters.max.groups": "1000", 
+            "tez.runtime.unordered.output.buffer.size-mb": "51", 
+            "tez.shuffle-vertex-manager.max-src-fraction": "0.4", 
+            "tez.counters.max": "2000", 
+            "tez.task.resource.memory.mb": "682", 
+            "tez.history.logging.service.class": "org.apache.tez.dag.history.logging.ats.ATSHistoryLoggingService", 
+            "tez.lib.uris": "/hdp/apps/${hdp.version}/tez/tez.tar.gz", 
+            "tez.task.am.heartbeat.counter.interval-ms.max": "4000", 
+            "tez.am.max.app.attempts": "2", 
+            "tez.am.launch.env": "LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64", 
+            "tez.am.container.idle.release-timeout-max.millis": "20000", 
+            "tez.use.cluster.hadoop-libs": "false", 
+            "tez.am.launch.cluster-default.cmd-opts": "-server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}", 
+            "tez.am.container.idle.release-timeout-min.millis": "10000", 
+            "tez.runtime.compress.codec": "org.apache.hadoop.io.compress.SnappyCodec", 
+            "tez.task.launch.cluster-default.cmd-opts": "-server -Djava.net.preferIPv4Stack=true -Dhdp.version=${hdp.version}", 
+            "tez.task.launch.env": "LD_LIBRARY_PATH=/usr/hdp/${hdp.version}/hadoop/lib/native:/usr/hdp/${hdp.version}/hadoop/lib/native/Linux-amd64-64", 
+            "tez.am.container.reuse.enabled": "true", 
+            "tez.session.am.dag.submit.timeout.secs": "300", 
+            "tez.grouping.min-size": "16777216", 
+            "tez.grouping.max-size": "1073741824", 
+            "tez.session.client.timeout.secs": "-1", 
+            "tez.cluster.additional.classpath.prefix": "/usr/hdp/${hdp.version}/hadoop/lib/hadoop-lzo-0.6.0.${hdp.version}.jar:/etc/hadoop/conf/secure", 
+            "tez.am.launch.cmd-opts": "-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC", 
+            "tez.staging-dir": "/tmp/${user.name}/staging", 
+            "tez.am.am-rm.heartbeat.interval-ms.max": "250", 
+            "tez.am.maxtaskfailures.per.node": "10", 
+            "tez.am.container.reuse.non-local-fallback.enabled": "false", 
+            "tez.am.container.reuse.locality.delay-allocation-millis": "250", 
+            "tez.am.container.reuse.rack-fallback.enabled": "true", 
+            "tez.grouping.split-waves": "1.7", 
+            "tez.shuffle-vertex-manager.min-src-fraction": "0.2", 
+            "tez.am.resource.memory.mb": "1364"
+        }, 
+        "hdfs-site": {
+            "dfs.namenode.avoid.write.stale.datanode": "true", 
+            "dfs.permissions.superusergroup": "hdfs", 
+            "dfs.namenode.startup.delay.block.deletion.sec": "3600", 
+            "dfs.namenode.kerberos.internal.spnego.principal": "HTTP/_HOST@EXAMPLE.COM", 
+            "dfs.namenode.checkpoint.txns": "1000000", 
+            "dfs.block.access.token.enable": "true", 
+            "dfs.support.append": "true", 
+            "dfs.datanode.address": "0.0.0.0:1019", 
+            "dfs.cluster.administrators": " hdfs", 
+            "dfs.datanode.balance.bandwidthPerSec": "6250000", 
+            "dfs.namenode.safemode.threshold-pct": "1.0f", 
+            "dfs.namenode.checkpoint.edits.dir": "${dfs.namenode.checkpoint.dir}", 
+            "dfs.permissions.enabled": "true", 
+            "dfs.namenode.kerberos.principal": "nn/_HOST@EXAMPLE.COM", 
+            "dfs.namenode.checkpoint.dir": "/hadoop/hdfs/namesecondary", 
+            "dfs.https.port": "50470", 
+            "dfs.namenode.https-address": "c6401.ambari.apache.org:50470", 
+            "dfs.blockreport.initialDelay": "120", 
+            "dfs.journalnode.edits.dir": "/hadoop/hdfs/journalnode", 
+            "dfs.blocksize": "134217728", 
+            "dfs.client.read.shortcircuit": "true", 
+            "dfs.datanode.max.transfer.threads": "4096", 
+            "dfs.heartbeat.interval": "3", 
+            "dfs.replication": "3", 
+            "dfs.namenode.handler.count": "100", 
+            "dfs.web.authentication.kerberos.keytab": "/etc/security/keytabs/spnego.service.keytab", 
+            "fs.permissions.umask-mode": "022", 
+            "dfs.namenode.stale.datanode.interval": "30000", 
+            "dfs.datanode.ipc.address": "0.0.0.0:8010", 
+            "dfs.namenode.name.dir": "/hadoop/hdfs/namenode", 
+            "dfs.secondary.namenode.kerberos.internal.spnego.principal": "HTTP/_HOST@EXAMPLE.COM", 
+            "dfs.datanode.data.dir": "/hadoop/hdfs/data", 
+            "dfs.namenode.http-address": "c6401.ambari.apache.org:50070", 
+            "dfs.webhdfs.enabled": "true", 
+            "dfs.datanode.failed.volumes.tolerated": "0", 
+            "dfs.namenode.accesstime.precision": "0", 
+            "dfs.datanode.https.address": "0.0.0.0:50475", 
+            "dfs.namenode.avoid.read.stale.datanode": "true", 
+            "dfs.namenode.secondary.http-address": "c6402.ambari.apache.org:50090", 
+            "dfs.datanode.kerberos.principal": "dn/_HOST@EXAMPLE.COM", 
+            "dfs.datanode.http.address": "0.0.0.0:1022", 
+            "dfs.datanode.du.reserved": "1073741824", 
+            "dfs.client.read.shortcircuit.streams.cache.size": "4096", 
+            "dfs.secondary.namenode.keytab.file": "/etc/security/keytabs/nn.service.keytab", 
+            "dfs.web.authentication.kerberos.principal": "HTTP/_HOST@EXAMPLE.COM", 
+            "dfs.http.policy": "HTTP_ONLY", 
+            "dfs.secondary.namenode.kerberos.principal": "nn/_HOST@EXAMPLE.COM", 
+            "dfs.datanode.keytab.file": "/etc/security/keytabs/dn.service.keytab", 
+            "dfs.namenode.keytab.file": "/etc/security/keytabs/nn.service.keytab", 
+            "dfs.journalnode.https-address": "0.0.0.0:8481", 
+            "dfs.journalnode.http-address": "0.0.0.0:8480", 
+            "dfs.domain.socket.path": "/var/lib/hadoop-hdfs/dn_socket", 
+            "dfs.namenode.write.stale.datanode.ratio": "1.0f", 
+            "dfs.hosts.exclude": "/etc/hadoop/conf/dfs.exclude", 
+            "dfs.datanode.data.dir.perm": "750", 
+            "dfs.namenode.name.dir.restore": "true", 
+            "dfs.replication.max": "50", 
+            "dfs.namenode.checkpoint.period": "21600"
+        }, 
+        "tez-env": {
+            "content": "\n# Tez specific configuration\nexport TEZ_CONF_DIR={{config_dir}}\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}", 
+            "tez_user": "tez"
+        }, 
+        "yarn-log4j": {
+            "content": "\n#Relative to Yarn Log Dir Prefix\nyarn.log.dir=.\n#\n# Job Summary Appender\n#\n# Use following logger to send summary to separate file defined by\n# hadoop.mapreduce.jobsummary.log.file rolled daily:\n# hadoop.mapreduce.jobsummary.logger=INFO,JSA\n#\nhadoop.mapreduce.jobsummary.logger=${hadoop.root.logger}\nhadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log\nlog4j.appender.JSA=org.apache.log4j.DailyRollingFileAppender\n# Set the ResourceManager summary log filename\nyarn.server.resourcemanager.appsummary.log.file=hadoop-mapreduce.jobsummary.log\n# Set the ResourceManager summary log level and appender\nyarn.server.resourcemanager.appsummary.logger=${hadoop.root.logger}\n#yarn.server.resourcemanager.appsummary.logger=INFO,RMSUMMARY\n\n# To enable AppSummaryLogging for the RM,\n# set yarn.server.resourcemanager.appsummary.logger to\n# LEVEL,RMSUMMARY in hadoop-env.sh\n\n# Appender for ResourceManager Application Summary Log\n# Requires the 
 following properties to be set\n#    - hadoop.log.dir (Hadoop Log directory)\n#    - yarn.server.resourcemanager.appsummary.log.file (resource manager app summary log filename)\n#    - yarn.server.resourcemanager.appsummary.logger (resource manager app summary log level and appender)\nlog4j.appender.RMSUMMARY=org.apache.log4j.RollingFileAppender\nlog4j.appender.RMSUMMARY.File=${yarn.log.dir}/${yarn.server.resourcemanager.appsummary.log.file}\nlog4j.appender.RMSUMMARY.MaxFileSize=256MB\nlog4j.appender.RMSUMMARY.MaxBackupIndex=20\nlog4j.appender.RMSUMMARY.layout=org.apache.log4j.PatternLayout\nlog4j.appender.RMSUMMARY.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n\nlog4j.appender.JSA.layout=org.apache.log4j.PatternLayout\nlog4j.appender.JSA.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n\nlog4j.appender.JSA.DatePattern=.yyyy-MM-dd\nlog4j.appender.JSA.layout=org.apache.log4j.PatternLayout\nlog4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$Applic
 ationSummary=${yarn.server.resourcemanager.appsummary.logger}\nlog4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=false"
+        }, 
+        "hadoop-policy": {
+            "security.job.client.protocol.acl": "*", 
+            "security.job.task.protocol.acl": "*", 
+            "security.datanode.protocol.acl": "*", 
+            "security.namenode.protocol.acl": "*", 
+            "security.client.datanode.protocol.acl": "*", 
+            "security.inter.tracker.protocol.acl": "*", 
+            "security.refresh.usertogroups.mappings.protocol.acl": "hadoop", 
+            "security.client.protocol.acl": "*", 
+            "security.refresh.policy.protocol.acl": "hadoop", 
+            "security.admin.operations.protocol.acl": "hadoop", 
+            "security.inter.datanode.protocol.acl": "*"
+        }, 
+        "hdfs-log4j": {
+            "content": "\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements.  See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership.  The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License.  You may obtain a copy of the License at\n#\n#  http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied.  See the License for the\n# specific language governing permissions and limitations\n# under the License.\n#\n\n\n# Define some default values that can be overridden by system properties\n# To change daemon root logger use hadoop_root_logger in hadoop-env\nhadoop.root.lo
 gger=INFO,console\nhadoop.log.dir=.\nhadoop.log.file=hadoop.log\n\n\n# Define the root logger to the system property \"hadoop.root.logger\".\nlog4j.rootLogger=${hadoop.root.logger}, EventCounter\n\n# Logging Threshold\nlog4j.threshhold=ALL\n\n#\n# Daily Rolling File Appender\n#\n\nlog4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender\nlog4j.appender.DRFA.File=${hadoop.log.dir}/${hadoop.log.file}\n\n# Rollver at midnight\nlog4j.appender.DRFA.DatePattern=.yyyy-MM-dd\n\n# 30-day backup\n#log4j.appender.DRFA.MaxBackupIndex=30\nlog4j.appender.DRFA.layout=org.apache.log4j.PatternLayout\n\n# Pattern format: Date LogLevel LoggerName LogMessage\nlog4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n\n# Debugging Pattern format\n#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n\n\n\n#\n# console\n# Add \"console\" to rootlogger above if you want to use this\n#\n\nlog4j.appender.console=org.apache.log4j.ConsoleAppender\nlog4j.appender
 .console.target=System.err\nlog4j.appender.console.layout=org.apache.log4j.PatternLayout\nlog4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n\n\n#\n# TaskLog Appender\n#\n\n#Default values\nhadoop.tasklog.taskid=null\nhadoop.tasklog.iscleanup=false\nhadoop.tasklog.noKeepSplits=4\nhadoop.tasklog.totalLogFileSize=100\nhadoop.tasklog.purgeLogSplits=true\nhadoop.tasklog.logsRetainHours=12\n\nlog4j.appender.TLA=org.apache.hadoop.mapred.TaskLogAppender\nlog4j.appender.TLA.taskId=${hadoop.tasklog.taskid}\nlog4j.appender.TLA.isCleanup=${hadoop.tasklog.iscleanup}\nlog4j.appender.TLA.totalLogFileSize=${hadoop.tasklog.totalLogFileSize}\n\nlog4j.appender.TLA.layout=org.apache.log4j.PatternLayout\nlog4j.appender.TLA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n\n\n#\n#Security audit appender\n#\nhadoop.security.logger=INFO,console\nhadoop.security.log.maxfilesize=256MB\nhadoop.security.log.maxbackupindex=20\nlog4j.category.SecurityLogger=${hadoop.security.logg
 er}\nhadoop.security.log.file=SecurityAuth.audit\nlog4j.appender.DRFAS=org.apache.log4j.DailyRollingFileAppender\nlog4j.appender.DRFAS.File=${hadoop.log.dir}/${hadoop.security.log.file}\nlog4j.appender.DRFAS.layout=org.apache.log4j.PatternLayout\nlog4j.appender.DRFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n\nlog4j.appender.DRFAS.DatePattern=.yyyy-MM-dd\n\nlog4j.appender.RFAS=org.apache.log4j.RollingFileAppender\nlog4j.appender.RFAS.File=${hadoop.log.dir}/${hadoop.security.log.file}\nlog4j.appender.RFAS.layout=org.apache.log4j.PatternLayout\nlog4j.appender.RFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n\nlog4j.appender.RFAS.MaxFileSize=${hadoop.security.log.maxfilesize}\nlog4j.appender.RFAS.MaxBackupIndex=${hadoop.security.log.maxbackupindex}\n\n#\n# hdfs audit logging\n#\nhdfs.audit.logger=INFO,console\nlog4j.logger.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=${hdfs.audit.logger}\nlog4j.additivity.org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit=
 false\nlog4j.appender.DRFAAUDIT=org.apache.log4j.DailyRollingFileAppender\nlog4j.appender.DRFAAUDIT.File=${hadoop.log.dir}/hdfs-audit.log\nlog4j.appender.DRFAAUDIT.layout=org.apache.log4j.PatternLayout\nlog4j.appender.DRFAAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n\nlog4j.appender.DRFAAUDIT.DatePattern=.yyyy-MM-dd\n\n#\n# mapred audit logging\n#\nmapred.audit.logger=INFO,console\nlog4j.logger.org.apache.hadoop.mapred.AuditLogger=${mapred.audit.logger}\nlog4j.additivity.org.apache.hadoop.mapred.AuditLogger=false\nlog4j.appender.MRAUDIT=org.apache.log4j.DailyRollingFileAppender\nlog4j.appender.MRAUDIT.File=${hadoop.log.dir}/mapred-audit.log\nlog4j.appender.MRAUDIT.layout=org.apache.log4j.PatternLayout\nlog4j.appender.MRAUDIT.layout.ConversionPattern=%d{ISO8601} %p %c{2}: %m%n\nlog4j.appender.MRAUDIT.DatePattern=.yyyy-MM-dd\n\n#\n# Rolling File Appender\n#\n\nlog4j.appender.RFA=org.apache.log4j.RollingFileAppender\nlog4j.appender.RFA.File=${hadoop.log.dir}/${hadoop.log.fi
 le}\n\n# Logfile size and and 30-day backups\nlog4j.appender.RFA.MaxFileSize=256MB\nlog4j.appender.RFA.MaxBackupIndex=10\n\nlog4j.appender.RFA.layout=org.apache.log4j.PatternLayout\nlog4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} - %m%n\nlog4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n\n\n\n# Custom Logging levels\n\nhadoop.metrics.log.level=INFO\n#log4j.logger.org.apache.hadoop.mapred.JobTracker=DEBUG\n#log4j.logger.org.apache.hadoop.mapred.TaskTracker=DEBUG\n#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG\nlog4j.logger.org.apache.hadoop.metrics2=${hadoop.metrics.log.level}\n\n# Jets3t library\nlog4j.logger.org.jets3t.service.impl.rest.httpclient.RestS3Service=ERROR\n\n#\n# Null Appender\n# Trap security logger on the hadoop client side\n#\nlog4j.appender.NullAppender=org.apache.log4j.varia.NullAppender\n\n#\n# Event Counter Appender\n# Sends counts of logging messages at different severity levels to Hadoop Metrics.\n#\n
 log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter\n\n# Removes \"deprecated\" messages\nlog4j.logger.org.apache.hadoop.conf.Configuration.deprecation=WARN\n\n#\n# HDFS block state change log from block manager\n#\n# Uncomment the following to suppress normal block state change\n# messages from BlockManager in NameNode.\n#log4j.logger.BlockStateChange=WARN"
+        }, 
+        "mapred-env": {
+            "content": "\n# export JAVA_HOME=/home/y/libexec/jdk1.6.0/\n\nexport HADOOP_JOB_HISTORYSERVER_HEAPSIZE={{jobhistory_heapsize}}\n\nexport HADOOP_MAPRED_ROOT_LOGGER=INFO,RFA\n\n#export HADOOP_JOB_HISTORYSERVER_OPTS=\n#export HADOOP_MAPRED_LOG_DIR=\"\" # Where log files are stored.  $HADOOP_MAPRED_HOME/logs by default.\n#export HADOOP_JHS_LOGGER=INFO,RFA # Hadoop JobSummary logger.\n#export HADOOP_MAPRED_PID_DIR= # The pid files are stored. /tmp by default.\n#export HADOOP_MAPRED_IDENT_STRING= #A string representing this instance of hadoop. $USER by default\n#export HADOOP_MAPRED_NICENESS= #The scheduling priority for daemons. Defaults to 0.\nexport HADOOP_OPTS=\"-Dhdp.version=$HDP_VERSION $HADOOP_OPTS\"", 
+            "mapred_pid_dir_prefix": "/var/run/hadoop-mapreduce", 
+            "mapred_user": "mapred", 
+            "jobhistory_heapsize": "900", 
+            "mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
+        }, 
+        "krb5-conf": {
+            "conf_dir": "/etc",
+            "content": "\n[libdefaults]\n  renew_lifetime = 7d\n  forwardable = true\n  default_realm = {{realm}}\n  ticket_lifetime = 24h\n  dns_lookup_realm = false\n  dns_lookup_kdc = false\n  #default_tgs_enctypes = {{encryption_types}}\n  #default_tkt_enctypes = {{encryption_types}}\n{% if domains %}\n[domain_realm]\n{%- for domain in domains.split(',') %}\n  {{domain|trim()}} = {{realm}}\n{%- endfor %}\n{% endif %}\n[logging]\n  default = FILE:/var/log/krb5kdc.log\n  admin_server = FILE:/var/log/kadmind.log\n  kdc = FILE:/var/log/krb5kdc.log\n\n[realms]\n  {{realm}} = {\n{%- if kdc_hosts > 0 -%}\n{%- set kdc_host_list = kdc_hosts.split(',')  -%}\n{%- if kdc_host_list and kdc_host_list|length > 0 %}\n    admin_server = {{admin_server_host|default(kdc_host_list[0]|trim(), True)}}\n{%- if kdc_host_list -%}\n{% for kdc_host in kdc_host_list %}\n    kdc = {{kdc_host|trim()}}\n{%- endfor -%}\n{% endif %}\n{%- endif %}\n{%- endif %}\n  }\n\n{# Append additional realm declarations bel
 ow #}\n    ",
+            "domains": "",
+            "manage_krb5_conf": "true"
+        },
+        "pig-properties": {
+            "content": "\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements.  See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership.  The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License.  You may obtain a copy of the License at\n#\n#   http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied.  See the License for the\n# specific language governing permissions and limitations\n# under the License.\n\n# Pig default configuration file. All values can be overwritten by pig.properties and command line arguments.\n# see bin/pig -help\n\n# brief logging (no timestamps
 )\nbrief=false\n\n# debug level, INFO is default\ndebug=INFO\n\n# verbose print all log messages to screen (default to print only INFO and above to screen)\nverbose=false\n\n# exectype local|mapreduce, mapreduce is default\nexectype=mapreduce\n\n# Enable insertion of information about script into hadoop job conf \npig.script.info.enabled=true\n\n# Do not spill temp files smaller than this size (bytes)\npig.spill.size.threshold=5000000\n\n# EXPERIMENT: Activate garbage collection when spilling a file bigger than this size (bytes)\n# This should help reduce the number of files being spilled.\npig.spill.gc.activation.size=40000000\n\n# the following two parameters are to help estimate the reducer number\npig.exec.reducers.bytes.per.reducer=1000000000\npig.exec.reducers.max=999\n\n# Temporary location to store the intermediate data.\npig.temp.dir=/tmp/\n\n# Threshold for merging FRJoin fragment files\npig.files.concatenation.threshold=100\npig.optimistic.files.concatenation=false;\n\npi
 g.disable.counter=false\n\n# Avoid pig failures when multiple jobs write to the same location\npig.location.check.strict=false\n\nhcat.bin=/usr/bin/hcat"
+        }, 
+        "core-site": {
+            "hadoop.http.authentication.signature.secret": "", 
+            "proxyuser_group": "users", 
+            "hadoop.http.authentication.cookie.domain": "", 
+            "hadoop.http.authentication.simple.anonymous.allowed": "true", 
+            "fs.trash.interval": "360", 
+            "hadoop.http.authentication.signer.secret.provider.object": "", 
+            "hadoop.http.authentication.token.validity": "", 
+            "io.compression.codecs": "org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec", 
+            "ipc.client.idlethreshold": "8000", 
+            "hadoop.http.authentication.cookie.path": "", 
+            "hadoop.http.authentication.signer.secret.provider": "", 
+            "io.serializations": "org.apache.hadoop.io.serializer.WritableSerialization", 
+            "hadoop.rpc.protection": "authentication", 
+            "io.file.buffer.size": "131072", 
+            "hadoop.security.authentication": "kerberos", 
+            "hadoop.http.filter.initializers": "", 
+            "mapreduce.jobtracker.webinterface.trusted": "false", 
+            "hadoop.http.authentication.kerberos.name.rules": "", 
+            "hadoop.proxyuser.HTTP.groups": "users", 
+            "fs.defaultFS": "hdfs://c6401.ambari.apache.org:8020", 
+            "ha.failover-controller.active-standby-elector.zk.op.retries": "120", 
+            "hadoop.http.authentication.signature.secret.file": "", 
+            "hadoop.http.authentication.type": "simple", 
+            "hadoop.security.authorization": "true", 
+            "ipc.server.tcpnodelay": "true", 
+            "ipc.client.connect.max.retries": "50", 
+            "hadoop.security.auth_to_local": "RULE:[1:$1@$0](ambari-qa@EXAMPLE.COM)s/.*/ambari-qa/\nRULE:[1:$1@$0](hdfs@EXAMPLE.COM)s/.*/hdfs/\nRULE:[1:$1@$0](.*@EXAMPLE.COM)s/@.*//\nRULE:[2:$1@$0](dn@EXAMPLE.COM)s/.*/hdfs/\nRULE:[2:$1@$0](jhs@EXAMPLE.COM)s/.*/mapred/\nRULE:[2:$1@$0](jn@EXAMPLE.COM)s/.*/hdfs/\nRULE:[2:$1@$0](nm@EXAMPLE.COM)s/.*/yarn/\nRULE:[2:$1@$0](nn@EXAMPLE.COM)s/.*/hdfs/\nRULE:[2:$1@$0](rm@EXAMPLE.COM)s/.*/yarn/\nRULE:[2:$1@$0](yarn@EXAMPLE.COM)s/.*/yarn/\nDEFAULT", 
+            "ipc.client.connection.maxidletime": "30000"
+        }, 
+        "yarn-env": {
+            "yarn_pid_dir_prefix": "/var/run/hadoop-yarn", 
+            "apptimelineserver_heapsize": "1024", 
+            "nodemanager_heapsize": "1024", 
+            "content": "\nexport HADOOP_YARN_HOME={{hadoop_yarn_home}}\nexport YARN_LOG_DIR={{yarn_log_dir_prefix}}/$USER\nexport YARN_PID_DIR={{yarn_pid_dir_prefix}}/$USER\nexport HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}\nexport JAVA_HOME={{java64_home}}\n\n# User for YARN daemons\nexport HADOOP_YARN_USER=${HADOOP_YARN_USER:-yarn}\n\n# resolve links - $0 may be a softlink\nexport YARN_CONF_DIR=\"${YARN_CONF_DIR:-$HADOOP_YARN_HOME/conf}\"\n\n# some Java parameters\n# export JAVA_HOME=/home/y/libexec/jdk1.6.0/\nif [ \"$JAVA_HOME\" != \"\" ]; then\n  #echo \"run java in $JAVA_HOME\"\n  JAVA_HOME=$JAVA_HOME\nfi\n\nif [ \"$JAVA_HOME\" = \"\" ]; then\n  echo \"Error: JAVA_HOME is not set.\"\n  exit 1\nfi\n\nJAVA=$JAVA_HOME/bin/java\nJAVA_HEAP_MAX=-Xmx1000m\n\n# For setting YARN specific HEAP sizes please use this\n# Parameter and set appropriately\nYARN_HEAPSIZE={{yarn_heapsize}}\n\n# check envvars which might override default args\nif [ \"$YARN_HEAPSIZE\" != \"\" ]; then\n  JAVA_HEAP_M
 AX=\"-Xmx\"\"$YARN_HEAPSIZE\"\"m\"\nfi\n\n# Resource Manager specific parameters\n\n# Specify the max Heapsize for the ResourceManager using a numerical value\n# in the scale of MB. For example, to specify an jvm option of -Xmx1000m, set\n# the value to 1000.\n# This value will be overridden by an Xmx setting specified in either YARN_OPTS\n# and/or YARN_RESOURCEMANAGER_OPTS.\n# If not specified, the default value will be picked from either YARN_HEAPMAX\n# or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.\nexport YARN_RESOURCEMANAGER_HEAPSIZE={{resourcemanager_heapsize}}\n\n# Specify the JVM options to be used when starting the ResourceManager.\n# These options will be appended to the options specified as YARN_OPTS\n# and therefore may override any similar flags set in YARN_OPTS\n#export YARN_RESOURCEMANAGER_OPTS=\n\n# Node Manager specific parameters\n\n# Specify the max Heapsize for the NodeManager using a numerical value\n# in the scale of MB. For example, to 
 specify an jvm option of -Xmx1000m, set\n# the value to 1000.\n# This value will be overridden by an Xmx setting specified in either YARN_OPTS\n# and/or YARN_NODEMANAGER_OPTS.\n# If not specified, the default value will be picked from either YARN_HEAPMAX\n# or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.\nexport YARN_NODEMANAGER_HEAPSIZE={{nodemanager_heapsize}}\n\n# Specify the max Heapsize for the HistoryManager using a numerical value\n# in the scale of MB. For example, to specify an jvm option of -Xmx1000m, set\n# the value to 1024.\n# This value will be overridden by an Xmx setting specified in either YARN_OPTS\n# and/or YARN_HISTORYSERVER_OPTS.\n# If not specified, the default value will be picked from either YARN_HEAPMAX\n# or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.\nexport YARN_HISTORYSERVER_HEAPSIZE={{apptimelineserver_heapsize}}\n\n# Specify the JVM options to be used when starting the NodeManager.\n# These options will be
  appended to the options specified as YARN_OPTS\n# and therefore may override any similar flags set in YARN_OPTS\n#export YARN_NODEMANAGER_OPTS=\n\n# so that filenames w/ spaces are handled correctly in loops below\nIFS=\n\n\n# default log directory and file\nif [ \"$YARN_LOG_DIR\" = \"\" ]; then\n  YARN_LOG_DIR=\"$HADOOP_YARN_HOME/logs\"\nfi\nif [ \"$YARN_LOGFILE\" = \"\" ]; then\n  YARN_LOGFILE='yarn.log'\nfi\n\n# default policy file for service-level authorization\nif [ \"$YARN_POLICYFILE\" = \"\" ]; then\n  YARN_POLICYFILE=\"hadoop-policy.xml\"\nfi\n\n# restore ordinary behaviour\nunset IFS\n\n\nYARN_OPTS=\"$YARN_OPTS -Dhadoop.log.dir=$YARN_LOG_DIR\"\nYARN_OPTS=\"$YARN_OPTS -Dyarn.log.dir=$YARN_LOG_DIR\"\nYARN_OPTS=\"$YARN_OPTS -Dhadoop.log.file=$YARN_LOGFILE\"\nYARN_OPTS=\"$YARN_OPTS -Dyarn.log.file=$YARN_LOGFILE\"\nYARN_OPTS=\"$YARN_OPTS -Dyarn.home.dir=$YARN_COMMON_HOME\"\nYARN_OPTS=\"$YARN_OPTS -Dyarn.id.str=$YARN_IDENT_STRING\"\nYARN_OPTS=\"$YARN_OPTS -Dhadoop.root.logger=$
 {YARN_ROOT_LOGGER:-INFO,console}\"\nYARN_OPTS=\"$YARN_OPTS -Dyarn.root.logger=${YARN_ROOT_LOGGER:-INFO,console}\"\nif [ \"x$JAVA_LIBRARY_PATH\" != \"x\" ]; then\n  YARN_OPTS=\"$YARN_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH\"\nfi\nYARN_OPTS=\"$YARN_OPTS -Dyarn.policy.file=$YARN_POLICYFILE\"", 
+            "yarn_heapsize": "1024", 
+            "min_user_id": "500", 
+            "yarn_user": "yarn", 
+            "resourcemanager_heapsize": "1024", 
+            "yarn_log_dir_prefix": "/var/log/hadoop-yarn"
+        }, 
+        "hadoop-env": {
+            "dtnode_heapsize": "1024m", 
+            "namenode_opt_maxnewsize": "256m", 
+            "hdfs_log_dir_prefix": "/var/log/hadoop", 
+            "namenode_heapsize": "1024m", 
+            "proxyuser_group": "users", 
+            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab", 
+            "hadoop_pid_dir_prefix": "/var/run/hadoop", 
+            "content": "\n# Set Hadoop-specific environment variables here.\n\n# The only required environment variable is JAVA_HOME.  All others are\n# optional.  When running a distributed configuration it is best to\n# set JAVA_HOME in this file, so that it is correctly defined on\n# remote nodes.\n\n# The java implementation to use.  Required.\nexport JAVA_HOME={{java_home}}\nexport HADOOP_HOME_WARN_SUPPRESS=1\n\n# Hadoop home directory\nexport HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\n# Hadoop Configuration Directory\n\n{# this is different for HDP1 #}\n# Path to jsvc required by secure HDP 2.0 datanode\nexport JSVC_HOME={{jsvc_path}}\n\n\n# The maximum amount of heap to use, in MB. Default is 1000.\nexport HADOOP_HEAPSIZE=\"{{hadoop_heapsize}}\"\n\nexport HADOOP_NAMENODE_INIT_HEAPSIZE=\"-Xms{{namenode_heapsize}}\"\n\n# Extra Java runtime options.  Empty by default.\nexport HADOOP_OPTS=\"-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}\"\n\n# Command specific options appende
 d to HADOOP_OPTS when specified\nexport HADOOP_NAMENODE_OPTS=\"-server -XX:ParallelGCThreads=8 -XX:+UseConcMarkSweepGC -XX:ErrorFile={{hdfs_log_dir_prefix}}/$USER/hs_err_pid%p.log -XX:NewSize={{namenode_opt_newsize}} -XX:MaxNewSize={{namenode_opt_maxnewsize}} -XX:PermSize={{namenode_opt_permsize}} -XX:MaxPermSize={{namenode_opt_maxpermsize}} -Xloggc:{{hdfs_log_dir_prefix}}/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xms{{namenode_heapsize}} -Xmx{{namenode_heapsize}} -Dhadoop.security.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}\"\nHADOOP_JOBTRACKER_OPTS=\"-server -XX:ParallelGCThreads=8 -XX:+UseConcMarkSweepGC -XX:ErrorFile={{hdfs_log_dir_prefix}}/$USER/hs_err_pid%p.log -XX:NewSize={{jtnode_opt_newsize}} -XX:MaxNewSize={{jtnode_opt_maxnewsize}} -Xloggc:{{hdfs_log_dir_prefix}}/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStam
 ps -Xmx{{jtnode_heapsize}} -Dhadoop.security.logger=INFO,DRFAS -Dmapred.audit.logger=INFO,MRAUDIT -Dhadoop.mapreduce.jobsummary.logger=INFO,JSA ${HADOOP_JOBTRACKER_OPTS}\"\n\nHADOOP_TASKTRACKER_OPTS=\"-server -Xmx{{ttnode_heapsize}} -Dhadoop.security.logger=ERROR,console -Dmapred.audit.logger=ERROR,console ${HADOOP_TASKTRACKER_OPTS}\"\nexport HADOOP_DATANODE_OPTS=\"-server -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:ErrorFile=/var/log/hadoop/$USER/hs_err_pid%p.log -XX:NewSize=200m -XX:MaxNewSize=200m -XX:PermSize=128m -XX:MaxPermSize=256m -Xloggc:/var/log/hadoop/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xms{{dtnode_heapsize}} -Xmx{{dtnode_heapsize}} -Dhadoop.security.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_DATANODE_OPTS}\"\nHADOOP_BALANCER_OPTS=\"-server -Xmx{{hadoop_heapsize}}m ${HADOOP_BALANCER_OPTS}\"\n\nexport HADOOP_SECONDARYNAMENODE_OPTS=$HADOOP_NAMENODE_OPTS\n\n# The following
  applies to multiple commands (fs, dfs, fsck, distcp etc)\nexport HADOOP_CLIENT_OPTS=\"-Xmx${HADOOP_HEAPSIZE}m -XX:MaxPermSize=512m $HADOOP_CLIENT_OPTS\"\n\n# On secure datanodes, user to run the datanode as after dropping privileges\nexport HADOOP_SECURE_DN_USER=${HADOOP_SECURE_DN_USER:-{{hadoop_secure_dn_user}}}\n\n# Extra ssh options.  Empty by default.\nexport HADOOP_SSH_OPTS=\"-o ConnectTimeout=5 -o SendEnv=HADOOP_CONF_DIR\"\n\n# Where log files are stored.  $HADOOP_HOME/logs by default.\nexport HADOOP_LOG_DIR={{hdfs_log_dir_prefix}}/$USER\n\n# History server logs\nexport HADOOP_MAPRED_LOG_DIR={{mapred_log_dir_prefix}}/$USER\n\n# Where log files are stored in the secure data environment.\nexport HADOOP_SECURE_DN_LOG_DIR={{hdfs_log_dir_prefix}}/$HADOOP_SECURE_DN_USER\n\n# File naming remote slave hosts.  $HADOOP_HOME/conf/slaves by default.\n# export HADOOP_SLAVES=${HADOOP_HOME}/conf/slaves\n\n# host:path where hadoop code should be rsync'd from.  Unset by default.\n# export HAD
 OOP_MASTER=master:/home/$USER/src/hadoop\n\n# Seconds to sleep between slave commands.  Unset by default.  This\n# can be useful in large clusters, where, e.g., slave rsyncs can\n# otherwise arrive faster than the master can service them.\n# export HADOOP_SLAVE_SLEEP=0.1\n\n# The directory where pid files are stored. /tmp by default.\nexport HADOOP_PID_DIR={{hadoop_pid_dir_prefix}}/$USER\nexport HADOOP_SECURE_DN_PID_DIR={{hadoop_pid_dir_prefix}}/$HADOOP_SECURE_DN_USER\n\n# History server pid\nexport HADOOP_MAPRED_PID_DIR={{mapred_pid_dir_prefix}}/$USER\n\nYARN_RESOURCEMANAGER_OPTS=\"-Dyarn.server.resourcemanager.appsummary.logger=INFO,RMSUMMARY\"\n\n# A string representing this instance of hadoop. $USER by default.\nexport HADOOP_IDENT_STRING=$USER\n\n# The scheduling priority for daemon processes.  See 'man nice'.\n\n# export HADOOP_NICENESS=10\n\n# Use libraries from standard classpath\nJAVA_JDBC_LIBS=\"\"\n#Add libraries required by mysql connector\nfor jarFile in `ls /usr/share/
 java/*mysql* 2>/dev/null`\ndo\n  JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile\ndone\n# Add libraries required by oracle connector\nfor jarFile in `ls /usr/share/java/*ojdbc* 2>/dev/null`\ndo\n  JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile\ndone\n# Add libraries required by nodemanager\nMAPREDUCE_LIBS={{mapreduce_libs_path}}\nexport HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS}\n\n# added to the HADOOP_CLASSPATH\nif [ -d \"/usr/hdp/current/tez-client\" ]; then\n  if [ -d \"/etc/tez/conf/\" ]; then\n    # When using versioned RPMs, the tez-client will be a symlink to the current folder of tez in HDP.\n    export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:/usr/hdp/current/tez-client/*:/usr/hdp/current/tez-client/lib/*:/etc/tez/conf/\n  fi\nfi\n\n\n# Setting path to hdfs command line\nexport HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}\n\n# Mostly required for hadoop 2.0\nexport JAVA_LIBRARY_PATH=${JAVA_LIBRARY_PATH}\n\nexport HADOOP_OPTS=\"-Dhdp.version=$HDP_VERSION $HADOOP_
 OPTS\"", 
+            "hdfs_user": "hdfs", 
+            "namenode_opt_newsize": "256m", 
+            "hadoop_root_logger": "INFO,RFA", 
+            "hadoop_heapsize": "1024", 
+            "namenode_opt_maxpermsize": "256m", 
+            "namenode_opt_permsize": "128m", 
+            "hdfs_principal_name": "hdfs@EXAMPLE.COM"
+        }, 
+        "zookeeper-log4j": {
+            "content": "\n#\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements.  See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership.  The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License.  You may obtain a copy of the License at\n#\n#   http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied.  See the License for the\n# specific language governing permissions and limitations\n# under the License.\n#\n#\n#\n\n#\n# ZooKeeper Logging Configuration\n#\n\n# DEFAULT: console appender only\nlog4j.rootLogger=INFO, CONSOLE\n\n# Example with rolling log file\n#log4
 j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE\n\n# Example with rolling log file and tracing\n#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE\n\n#\n# Log INFO level and above messages to the console\n#\nlog4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender\nlog4j.appender.CONSOLE.Threshold=INFO\nlog4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout\nlog4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n\n\n#\n# Add ROLLINGFILE to rootLogger to get log file output\n#    Log DEBUG level and above messages to a log file\nlog4j.appender.ROLLINGFILE=org.apache.log4j.RollingFileAppender\nlog4j.appender.ROLLINGFILE.Threshold=DEBUG\nlog4j.appender.ROLLINGFILE.File=zookeeper.log\n\n# Max log file size of 10MB\nlog4j.appender.ROLLINGFILE.MaxFileSize=10MB\n# uncomment the next line to limit number of backup files\n#log4j.appender.ROLLINGFILE.MaxBackupIndex=10\n\nlog4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout\nlog4j.appender.ROLLIN
 GFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n\n\n\n#\n# Add TRACEFILE to rootLogger to get log file output\n#    Log DEBUG level and above messages to a log file\nlog4j.appender.TRACEFILE=org.apache.log4j.FileAppender\nlog4j.appender.TRACEFILE.Threshold=TRACE\nlog4j.appender.TRACEFILE.File=zookeeper_trace.log\n\nlog4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout\n### Notice we are including log4j's NDC here (%x)\nlog4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n"
+        }, 
+        "yarn-site": {
+            "yarn.timeline-service.http-authentication.kerberos.keytab": "/etc/security/keytabs/spnego.service.keytab", 
+            "yarn.resourcemanager.webapp.address": "c6402.ambari.apache.org:8088", 
+            "yarn.resourcemanager.zk-num-retries": "1000", 
+            "yarn.timeline-service.http-authentication.signature.secret.file": "", 
+            "yarn.timeline-service.bind-host": "0.0.0.0", 
+            "yarn.resourcemanager.ha.enabled": "false", 
+            "yarn.nodemanager.linux-container-executor.cgroups.hierarchy": "hadoop-yarn", 
+            "yarn.timeline-service.http-authentication.signature.secret": "", 
+            "yarn.timeline-service.webapp.address": "c6402.ambari.apache.org:8188", 
+            "yarn.resourcemanager.state-store.max-completed-applications": "${yarn.resourcemanager.max-completed-applications}", 
+            "yarn.timeline-service.enabled": "true", 
+            "yarn.nodemanager.recovery.enabled": "true", 
+            "yarn.timeline-service.principal": "yarn/_HOST@EXAMPLE.COM", 
+            "yarn.nodemanager.keytab": "/etc/security/keytabs/nm.service.keytab", 
+            "yarn.timeline-service.address": "c6402.ambari.apache.org:10200", 
+            "yarn.resourcemanager.hostname": "c6402.ambari.apache.org", 
+            "yarn.resourcemanager.webapp.spnego-principal": "HTTP/_HOST@EXAMPLE.COM", 
+            "yarn.resourcemanager.am.max-attempts": "2", 
+            "yarn.nodemanager.log-aggregation.debug-enabled": "false", 
+            "yarn.resourcemanager.system-metrics-publisher.enabled": "true", 
+            "yarn.nodemanager.vmem-pmem-ratio": "2.1", 
+            "yarn.nodemanager.bind-host": "0.0.0.0", 
+            "yarn.resourcemanager.nodes.exclude-path": "/etc/hadoop/conf/yarn.exclude", 
+            "yarn.nodemanager.linux-container-executor.cgroups.mount": "false", 
+            "yarn.timeline-service.http-authentication.cookie.path": "", 
+            "yarn.resourcemanager.system-metrics-publisher.dispatcher.pool-size": "10", 
+            "yarn.log.server.url": "http://c6402.ambari.apache.org:19888/jobhistory/logs", 
+            "yarn.nodemanager.webapp.spnego-principal": "HTTP/_HOST@EXAMPLE.COM", 
+            "yarn.timeline-service.keytab": "/etc/security/keytabs/yarn.service.keytab", 
+            "yarn.application.classpath": "$HADOOP_CONF_DIR,/usr/hdp/current/hadoop-client/*,/usr/hdp/current/hadoop-client/lib/*,/usr/hdp/current/hadoop-hdfs-client/*,/usr/hdp/current/hadoop-hdfs-client/lib/*,/usr/hdp/current/hadoop-yarn-client/*,/usr/hdp/current/hadoop-yarn-client/lib/*", 
+            "yarn.resourcemanager.webapp.delegation-token-auth-filter.enabled": "false", 
+            "yarn.resourcemanager.keytab": "/etc/security/keytabs/rm.service.keytab", 
+            "yarn.resourcemanager.principal": "rm/_HOST@EXAMPLE.COM", 
+            "yarn.nodemanager.local-dirs": "/hadoop/yarn/local", 
+            "yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage": "false", 
+            "yarn.nodemanager.remote-app-log-dir-suffix": "logs", 
+            "yarn.resourcemanager.connect.max-wait.ms": "900000", 
+            "yarn.resourcemanager.address": "c6402.ambari.apache.org:8050", 
+            "yarn.timeline-service.http-authentication.token.validity": "", 
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true", 
+            "yarn.scheduler.maximum-allocation-mb": "2048", 
+            "yarn.nodemanager.container-monitor.interval-ms": "3000", 
+            "yarn.node-labels.fs-store.retry-policy-spec": "2000, 500", 
+            "yarn.resourcemanager.zk-acl": "world:anyone:rwcda", 
+            "yarn.resourcemanager.webapp.https.address": "c6402.ambari.apache.org:8090", 
+            "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.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", 
+            "yarn.nodemanager.aux-services.mapreduce_shuffle.class": "org.apache.hadoop.mapred.ShuffleHandler", 
+            "yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage": "90", 
+            "yarn.resourcemanager.zk-timeout-ms": "10000", 
+            "yarn.resourcemanager.fs.state-store.uri": " ", 
+            "yarn.nodemanager.linux-container-executor.group": "hadoop", 
+            "yarn.nodemanager.remote-app-log-dir": "/app-logs", 
+            "yarn.resourcemanager.work-preserving-recovery.scheduling-wait-ms": "10000", 
+            "yarn.timeline-service.generic-application-history.store-class": "org.apache.hadoop.yarn.server.applicationhistoryservice.NullApplicationHistoryStore", 
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "", 
+            "yarn.nodemanager.disk-health-checker.min-healthy-disks": "0.25", 
+            "yarn.nodemanager.principal": "nm/_HOST@EXAMPLE.COM", 
+            "yarn.resourcemanager.work-preserving-recovery.enabled": "true", 
+            "yarn.resourcemanager.resource-tracker.address": "c6402.ambari.apache.org:8025", 
+            "yarn.nodemanager.health-checker.script.timeout-ms": "60000", 
+            "yarn.resourcemanager.scheduler.class": "org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler", 
+            "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.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", 
+            "yarn.resourcemanager.webapp.spnego-keytab-file": "/etc/security/keytabs/spnego.service.keytab", 
+            "yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds": "-1", 
+            "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.timeline-service.client.max-retries": "30", 
+            "yarn.nodemanager.health-checker.interval-ms": "135000", 
+            "yarn.nodemanager.admin-env": "MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX", 
+            "yarn.nodemanager.vmem-check-enabled": "false", 
+            "yarn.acl.enable": "true", 
+            "yarn.node-labels.manager-class": "org.apache.hadoop.yarn.server.resourcemanager.nodelabels.MemoryRMNodeLabelsManager", 
+            "yarn.timeline-service.leveldb-timeline-store.read-cache-size": "104857600", 
+            "yarn.nodemanager.linux-container-executor.resources-handler.class": "org.apache.hadoop.yarn.server.nodemanager.util.DefaultLCEResourcesHandler", 
+            "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.signer.secret.provider": "", 
+            "yarn.resourcemanager.bind-host": "0.0.0.0", 
+            "yarn.http.policy": "HTTP_ONLY", 
+            "yarn.resourcemanager.zk-address": "c6402.ambari.apache.org:2181", 
+            "yarn.nodemanager.recovery.dir": "{{yarn_log_dir_prefix}}/nodemanager/recovery-state", 
+            "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor", 
+            "yarn.resourcemanager.store.class": "org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore", 
+            "yarn.nodemanager.webapp.spnego-keytab-file": "/etc/security/keytabs/spnego.service.keytab", 
+            "yarn.timeline-service.leveldb-timeline-store.path": "/hadoop/yarn/timeline", 
+            "yarn.scheduler.minimum-allocation-mb": "682", 
+            "yarn.timeline-service.ttl-enable": "true", 
+            "yarn.resourcemanager.scheduler.address": "c6402.ambari.apache.org:8030", 
+            "yarn.log-aggregation.retain-seconds": "2592000", 
+            "yarn.nodemanager.address": "0.0.0.0:45454", 
+            "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.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", 
+            "yarn.resourcemanager.recovery.enabled": "true", 
+            "yarn.timeline-service.http-authentication.cookie.domain": "", 
+            "yarn.resourcemanager.zk-retry-interval-ms": "1000", 
+            "yarn.admin.acl": "",
+            "yarn.node-labels.fs-store.root-dir": "/system/yarn/node-labels", 
+            "yarn.client.nodemanager-connect.retry-interval-ms": "10000", 
+            "yarn.resourcemanager.admin.address": "c6402.ambari.apache.org:8141", 
+            "yarn.timeline-service.webapp.https.address": "c6402.ambari.apache.org:8190", 
+            "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": ""
+        }, 
+        "capacity-scheduler": {
+            "yarn.scheduler.capacity.default.minimum-user-limit-percent": "100", 
+            "yarn.scheduler.capacity.root.default.maximum-capacity": "100", 
+            "yarn.scheduler.capacity.root.default.user-limit-factor": "1", 
+            "yarn.scheduler.capacity.root.accessible-node-labels": "*", 
+            "yarn.scheduler.capacity.root.default.state": "RUNNING", 
+            "yarn.scheduler.capacity.root.capacity": "100", 
+            "yarn.scheduler.capacity.root.default.capacity": "100", 
+            "yarn.scheduler.capacity.root.queues": "default", 
+            "yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity": "-1", 
+            "yarn.scheduler.capacity.root.default-node-label-expression": " ", 
+            "yarn.scheduler.capacity.node-locality-delay": "40", 
+            "yarn.scheduler.capacity.root.accessible-node-labels.default.capacity": "-1", 
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "*", 
+            "yarn.scheduler.capacity.maximum-am-resource-percent": "0.2", 
+            "yarn.scheduler.capacity.root.acl_administer_queue": "*", 
+            "yarn.scheduler.capacity.maximum-applications": "10000", 
+            "yarn.scheduler.capacity.root.default.acl_administer_jobs": "*", 
+            "yarn.scheduler.capacity.resource-calculator": "org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator"
+        }, 
+        "zoo.cfg": {
+            "clientPort": "2181", 
+            "autopurge.purgeInterval": "24", 
+            "syncLimit": "5", 
+            "dataDir": "/hadoop/zookeeper", 
+            "initLimit": "10", 
+            "tickTime": "2000", 
+            "autopurge.snapRetainCount": "30"
+        }, 
+        "zookeeper-env": {
+            "zk_user": "zookeeper", 
+            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab", 
+            "zk_log_dir": "/var/log/zookeeper", 
+            "content": "\nexport JAVA_HOME={{java64_home}}\nexport ZOOKEEPER_HOME={{zk_home}}\nexport ZOO_LOG_DIR={{zk_log_dir}}\nexport ZOOPIDFILE={{zk_pid_file}}\nexport SERVER_JVMFLAGS={{zk_server_heapsize}}\nexport JAVA=$JAVA_HOME/bin/java\nexport CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*\n\n{% if security_enabled %}\nexport SERVER_JVMFLAGS=\"$SERVER_JVMFLAGS -Djava.security.auth.login.config={{zk_server_jaas_file}}\"\nexport CLIENT_JVMFLAGS=\"$CLIENT_JVMFLAGS -Djava.security.auth.login.config={{zk_client_jaas_file}}\"\n{% endif %}", 
+            "zk_pid_dir": "/var/run/zookeeper", 
+            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM"
+        }, 
+        "pig-log4j": {
+            "content": "\n#\n#\n# Licensed to the Apache Software Foundation (ASF) under one\n# or more contributor license agreements.  See the NOTICE file\n# distributed with this work for additional information\n# regarding copyright ownership.  The ASF licenses this file\n# to you under the Apache License, Version 2.0 (the\n# \"License\"); you may not use this file except in compliance\n# with the License.  You may obtain a copy of the License at\n#\n#   http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing,\n# software distributed under the License is distributed on an\n# \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n# KIND, either express or implied.  See the License for the\n# specific language governing permissions and limitations\n# under the License.\n#\n#\n#\n\n# ***** Set root logger level to DEBUG and its only appender to A.\nlog4j.logger.org.apache.pig=info, A\n\n# ***** A is set to be a ConsoleAppender.\
 nlog4j.appender.A=org.apache.log4j.ConsoleAppender\n# ***** A uses PatternLayout.\nlog4j.appender.A.layout=org.apache.log4j.PatternLayout\nlog4j.appender.A.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n"
+        }, 
+        "cluster-env": {
+            "managed_hdfs_resource_property_names": "",
+            "security_enabled": "true",
+            "ignore_groupsusers_create": "false",
+            "kerberos_domain": "EXAMPLE.COM",
+            "user_group": "hadoop",
+            "smokeuser_principal_name": "ambari-qa@EXAMPLE.COM",
+            "smokeuser": "ambari-qa",
+            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab"
+        }
+    }, 
+    "configurationTags": {
+        "mapred-site": {
+            "tag": "version1425150589654"
+        }, 
+        "pig-env": {
+            "tag": "version1425325831978"
+        }, 
+        "ranger-hdfs-plugin-properties": {
+            "tag": "version1"
+        }, 
+        "kerberos-env": {
+            "tag": "version1425149782373"
+        }, 
+        "tez-site": {
+            "tag": "version1"
+        }, 
+        "hdfs-site": {
+            "tag": "version1425150589741"
+        }, 
+        "tez-env": {
+            "tag": "version1"
+        }, 
+        "yarn-log4j": {
+            "tag": "version1"
+        }, 
+        "hadoop-policy": {
+            "tag": "version1"
+        }, 
+        "hdfs-log4j": {
+            "tag": "version1"
+        }, 
+        "mapred-env": {
+            "tag": "version1"
+        }, 
+        "krb5-conf": {
+            "tag": "version1425149782373"
+        }, 
+        "pig-properties": {
+            "tag": "version1425325831978"
+        }, 
+        "core-site": {
+            "tag": "version1425150589818"
+        }, 
+        "yarn-env": {
+            "tag": "version1"
+        }, 
+        "hadoop-env": {
+            "tag": "version1425150589788"
+        }, 
+        "zookeeper-log4j": {
+            "tag": "version1"
+        }, 
+        "yarn-site": {
+            "tag": "version1425150589763"
+        }, 
+        "capacity-scheduler": {
+            "tag": "version1"
+        }, 
+        "zoo.cfg": {
+            "tag": "version1"
+        }, 
+        "zookeeper-env": {
+            "tag": "version1425150589681"
+        }, 
+        "pig-log4j": {
+            "tag": "version1425325831978"
+        }, 
+        "cluster-env": {
+            "tag": "version1425150589709"
+        }
+    }, 
+    "commandId": "15-0", 
+    "clusterHostInfo": {
+        "snamenode_host": [
+            "c6402.ambari.apache.org"
+        ], 
+        "nm_hosts": [
+            "c6403.ambari.apache.org", 
+            "c6401.ambari.apache.org", 
+            "c6402.ambari.apache.org"
+        ], 
+        "app_timeline_server_hosts": [
+            "c6402.ambari.apache.org"
+        ], 
+        "all_ping_ports": [
+            "8670", 
+            "8670", 
+            "8670"
+        ], 
+        "rm_host": [
+            "c6402.ambari.apache.org"
+        ], 
+        "all_hosts": [
+            "c6403.ambari.apache.org", 
+            "c6401.ambari.apache.org", 
+            "c6402.ambari.apache.org"
+        ], 
+        "slave_hosts": [
+            "c6403.ambari.apache.org", 
+            "c6401.ambari.apache.org", 
+            "c6402.ambari.apache.org"
+        ], 
+        "namenode_host": [
+            "c6401.ambari.apache.org"
+        ], 
+        "ambari_server_host": [
+            "c6401.ambari.apache.org"
+        ], 
+        "zookeeper_hosts": [
+            "c6403.ambari.apache.org", 
+            "c6401.ambari.apache.org", 
+            "c6402.ambari.apache.org"
+        ], 
+        "hs_host": [
+            "c6402.ambari.apache.org"
+        ]
+    }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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": ""
       }
     }, {


[5/5] ambari git commit: AMBARI-19337. Ambari has some spelling mistakes in YARN proxyuser properties in many places (Jay SenSharma via smohanty)

Posted by sm...@apache.org.
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/c689096d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c689096d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c689096d

Branch: refs/heads/trunk
Commit: c689096d13c62beafe1eb52a8aa9a4a8c4d9cd63
Parents: 37baf9a
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue Jan 17 12:18:06 2017 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue Jan 17 12:18:06 2017 -0800

----------------------------------------------------------------------
 .../YARN/2.1.0.2.0/kerberos.json                |   12 +-
 .../YARN/2.1.0.2.0/kerberos.json.orig           |  216 ++
 .../YARN/3.0.0.3.0/kerberos.json                |   12 +-
 .../YARN/3.0.0.3.0/kerberos.json.orig           |  280 ++
 .../stacks/HDP/2.2/services/YARN/kerberos.json  |   12 +-
 .../HDP/2.2/services/YARN/kerberos.json.orig    |  217 ++
 .../HDP/2.3.ECS/services/YARN/kerberos.json     |   12 +-
 .../2.3.ECS/services/YARN/kerberos.json.orig    |  220 ++
 .../stacks/HDP/2.3/services/YARN/kerberos.json  |   12 +-
 .../HDP/2.3/services/YARN/kerberos.json.orig    |  226 ++
 .../stacks/HDP/2.5/services/YARN/kerberos.json  |   12 +-
 .../HDP/2.5/services/YARN/kerberos.json.orig    |  280 ++
 .../stacks/PERF/1.0/services/YARN/kerberos.json |   12 +-
 .../PERF/1.0/services/YARN/kerberos.json.orig   |  278 ++
 .../2.2/configs/pig-service-check-secure.json   |   12 +-
 .../configs/pig-service-check-secure.json.orig  |  651 ++++
 .../test_kerberos_descriptor_2_1_3.json         |   12 +-
 .../test_kerberos_descriptor_2_1_3.json.orig    | 1320 ++++++++
 .../data/stacks/HDP-2.1/service_components.json |   12 +-
 .../stacks/HDP-2.1/service_components.json.orig | 3170 ++++++++++++++++++
 .../app/data/configs/wizards/secure_mapping.js  |   12 +-
 21 files changed, 6924 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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/c689096d/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json.orig b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json.orig
new file mode 100644
index 0000000..6b61c13
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json.orig
@@ -0,0 +1,216 @@
+{
+  "services": [
+    {
+      "name": "YARN",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "configurations": [
+        {
+          "yarn-site": {
+            "yarn.timeline-service.enabled": "false",
+            "yarn.timeline-service.http-authentication.type": "kerberos",
+            "yarn.acl.enable": "true",
+            "yarn.timeline-service.http-authentication.signature.secret": "",
+            "yarn.timeline-service.http-authentication.signature.secret.file": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+            "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.kerberos.name.rules": "",
+            "yarn.resourcemanager.proxyusers.*.groups": "",
+            "yarn.resourcemanager.proxyusers.*.hosts": "",
+            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
+            "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
+            "hadoop.registry.secure" : "true",
+            "hadoop.registry.system.accounts" : "sasl:yarn,sasl:mapred,sasl:hadoop,sasl:hdfs,sasl:rm"
+          }
+        },
+        {
+          "core-site": {
+            "hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+            "hadoop.proxyuser.${yarn-env/yarn_user}.hosts": "${clusterHostInfo/rm_host}"
+          }
+        }
+      ],
+      "components": [
+        {
+          "name": "NODEMANAGER",
+          "identities": [
+            {
+              "name": "nodemanager_nm",
+              "principal": {
+                "value": "nm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.nodemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/nm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.nodemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ],
+          "configurations": [
+            {
+              "yarn-site": {
+                "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+              }
+            }
+          ]
+        },
+        {
+          "name": "RESOURCEMANAGER",
+          "identities": [
+            {
+              "name": "resource_manager_rm",
+              "principal": {
+                "value": "rm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.resourcemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/rm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.resourcemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        },
+        {
+          "name": "APP_TIMELINE_SERVER",
+          "identities": [
+            {
+              "name": "app_timeline_server_yarn",
+              "principal": {
+                "value": "yarn/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.timeline-service.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/yarn.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.timeline-service.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MAPREDUCE2",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "components": [
+        {
+          "name": "HISTORYSERVER",
+          "identities": [
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "history_server_jhs",
+              "principal": {
+                "value": "jhs/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "mapred-site/mapreduce.jobhistory.principal",
+                "local_username": "${mapred-env/mapred_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/jhs.service.keytab",
+                "owner": {
+                  "name": "${mapred-env/mapred_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "mapred-site/mapreduce.jobhistory.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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/c689096d/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json.orig b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json.orig
new file mode 100644
index 0000000..d334887
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json.orig
@@ -0,0 +1,280 @@
+{
+  "services": [
+    {
+      "name": "YARN",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "configurations": [
+        {
+          "yarn-site": {
+            "yarn.timeline-service.enabled": "true",
+            "yarn.timeline-service.http-authentication.type": "kerberos",
+            "yarn.acl.enable": "true",
+            "yarn.admin.acl": "${yarn-env/yarn_user},dr.who",
+            "yarn.timeline-service.http-authentication.signature.secret": "",
+            "yarn.timeline-service.http-authentication.signature.secret.file": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+            "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.kerberos.name.rules": "",
+            "yarn.resourcemanager.proxyusers.*.groups": "",
+            "yarn.resourcemanager.proxyusers.*.hosts": "",
+            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
+            "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
+            "hadoop.registry.secure" : "true",
+            "hadoop.registry.system.accounts" : "sasl:yarn,sasl:mapred,sasl:hadoop,sasl:hdfs,sasl:rm"
+          }
+        },
+        {
+          "core-site": {
+            "hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+            "hadoop.proxyuser.${yarn-env/yarn_user}.hosts": "${clusterHostInfo/rm_host}"
+          }
+        },
+        {
+          "capacity-scheduler": {
+            "yarn.scheduler.capacity.root.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "${yarn-env/yarn_user}"
+          }
+        },
+        {
+          "ranger-yarn-audit": {
+            "xasecure.audit.jaas.Client.loginModuleName": "com.sun.security.auth.module.Krb5LoginModule",
+            "xasecure.audit.jaas.Client.loginModuleControlFlag": "required",
+            "xasecure.audit.jaas.Client.option.useKeyTab": "true",
+            "xasecure.audit.jaas.Client.option.storeKey": "false",
+            "xasecure.audit.jaas.Client.option.serviceName": "solr",
+            "xasecure.audit.destination.solr.force.use.inmemory.jaas.config": "true"
+          }
+        }
+      ],
+      "components": [
+        {
+          "name": "NODEMANAGER",
+          "identities": [
+            {
+              "name": "nodemanager_nm",
+              "principal": {
+                "value": "nm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.nodemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/nm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.nodemanager.keytab"
+              }
+            },
+            {
+              "name": "/HIVE/HIVE_SERVER/hive_server_hive",
+              "principal": {
+                "configuration": "hive-interactive-site/hive.llap.daemon.service.principal"
+              },
+              "keytab": {
+                "configuration": "hive-interactive-site/hive.llap.daemon.keytab.file"
+              },
+              "when" : {
+                "contains" : ["services", "HIVE"]
+              }
+            },
+            {
+              "name": "llap_zk_hive",
+              "principal": {
+                "value": "hive/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "hive-interactive-site/hive.llap.zk.sm.principal"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/hive.llap.zk.sm.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": "r"
+                },
+                "configuration": "hive-interactive-site/hive.llap.zk.sm.keytab.file"
+              },
+              "when" : {
+                "contains" : ["services", "HIVE"]
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ],
+          "configurations": [
+            {
+              "yarn-site": {
+                "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+              }
+            }
+          ]
+        },
+        {
+          "name": "RESOURCEMANAGER",
+          "identities": [
+            {
+              "name": "resource_manager_rm",
+              "principal": {
+                "value": "rm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.resourcemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/rm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.resourcemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file"
+              }
+            },
+            {
+              "name": "/YARN/RESOURCEMANAGER/resource_manager_rm",
+              "principal": {
+                "configuration": "ranger-yarn-audit/xasecure.audit.jaas.Client.option.principal"
+              },
+              "keytab": {
+                "configuration": "ranger-yarn-audit/xasecure.audit.jaas.Client.option.keyTab"
+              }
+            }
+          ]
+        },
+        {
+          "name": "APP_TIMELINE_SERVER",
+          "identities": [
+            {
+              "name": "app_timeline_server_yarn",
+              "principal": {
+                "value": "yarn/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.timeline-service.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/yarn.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.timeline-service.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MAPREDUCE2",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "components": [
+        {
+          "name": "HISTORYSERVER",
+          "identities": [
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "history_server_jhs",
+              "principal": {
+                "value": "jhs/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "mapred-site/mapreduce.jobhistory.principal",
+                "local_username": "${mapred-env/mapred_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/jhs.service.keytab",
+                "owner": {
+                  "name": "${mapred-env/mapred_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "mapred-site/mapreduce.jobhistory.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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/c689096d/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json.orig b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json.orig
new file mode 100644
index 0000000..ad30b76
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json.orig
@@ -0,0 +1,217 @@
+{
+  "services": [
+    {
+      "name": "YARN",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "configurations": [
+        {
+          "yarn-site": {
+            "yarn.timeline-service.enabled": "true",
+            "yarn.timeline-service.http-authentication.type": "kerberos",
+            "yarn.acl.enable": "true",
+            "yarn.timeline-service.http-authentication.signature.secret": "",
+            "yarn.timeline-service.http-authentication.signature.secret.file": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+            "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.kerberos.name.rules": "",
+            "yarn.resourcemanager.proxyusers.*.groups": "",
+            "yarn.resourcemanager.proxyusers.*.hosts": "",
+            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
+            "yarn.resourcemanager.zk-state-store.parent-path": "/rmstore-secure",
+            "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
+            "hadoop.registry.secure" : "true",
+            "hadoop.registry.system.accounts" : "sasl:yarn,sasl:mapred,sasl:hadoop,sasl:hdfs,sasl:rm"
+          }
+        },
+        {
+          "core-site": {
+            "hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+            "hadoop.proxyuser.${yarn-env/yarn_user}.hosts": "${clusterHostInfo/rm_host}"
+          }
+        }
+      ],
+      "components": [
+        {
+          "name": "NODEMANAGER",
+          "identities": [
+            {
+              "name": "nodemanager_nm",
+              "principal": {
+                "value": "nm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.nodemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/nm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.nodemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ],
+          "configurations": [
+            {
+              "yarn-site": {
+                "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+              }
+            }
+          ]
+        },
+        {
+          "name": "RESOURCEMANAGER",
+          "identities": [
+            {
+              "name": "resource_manager_rm",
+              "principal": {
+                "value": "rm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.resourcemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/rm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.resourcemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        },
+        {
+          "name": "APP_TIMELINE_SERVER",
+          "identities": [
+            {
+              "name": "app_timeline_server_yarn",
+              "principal": {
+                "value": "yarn/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.timeline-service.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/yarn.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.timeline-service.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MAPREDUCE2",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "components": [
+        {
+          "name": "HISTORYSERVER",
+          "identities": [
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "history_server_jhs",
+              "principal": {
+                "value": "jhs/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "mapred-site/mapreduce.jobhistory.principal",
+                "local_username": "${mapred-env/mapred_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/jhs.service.keytab",
+                "owner": {
+                  "name": "${mapred-env/mapred_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "mapred-site/mapreduce.jobhistory.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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/c689096d/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json.orig b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json.orig
new file mode 100644
index 0000000..7977941
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/YARN/kerberos.json.orig
@@ -0,0 +1,220 @@
+{
+  "services": [
+    {
+      "name": "YARN",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/ECS/hdfs"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "configurations": [
+        {
+          "yarn-site": {
+            "yarn.timeline-service.enabled": "false",
+            "yarn.timeline-service.http-authentication.type": "kerberos",
+            "yarn.acl.enable": "true",
+            "yarn.timeline-service.http-authentication.signature.secret": "",
+            "yarn.timeline-service.http-authentication.signature.secret.file": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+            "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.kerberos.name.rules": "",
+            "yarn.resourcemanager.proxyusers.*.groups": "",
+            "yarn.resourcemanager.proxyusers.*.hosts": "",
+            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
+            "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
+            "hadoop.registry.secure" : "true",
+            "hadoop.registry.system.accounts" : "sasl:yarn,sasl:mapred,sasl:hadoop,sasl:hdfs,sasl:rm"
+          }
+        },
+        {
+          "core-site": {
+            "hadoop.proxyuser.yarn.groups": "*",
+            "hadoop.proxyuser.yarn.hosts": "${yarn-site/yarn.resourcemanager.hostname}"
+          }
+        }
+      ],
+      "components": [
+        {
+          "name": "NODEMANAGER",
+          "identities": [
+            {
+              "name": "nodemanager_nm",
+              "principal": {
+                "value": "nm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.nodemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/nm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.nodemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ],
+          "configurations": [
+            {
+              "yarn-site": {
+                "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+              }
+            }
+          ]
+        },
+        {
+          "name": "RESOURCEMANAGER",
+          "identities": [
+            {
+              "name": "resource_manager_rm",
+              "principal": {
+                "value": "rm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.resourcemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/rm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.resourcemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        },
+        {
+          "name": "APP_TIMELINE_SERVER",
+          "identities": [
+            {
+              "name": "app_timeline_server_yarn",
+              "principal": {
+                "value": "yarn/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.timeline-service.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/yarn.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.timeline-service.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MAPREDUCE2",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/ECS/hdfs"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "components": [
+        {
+          "name": "HISTORYSERVER",
+          "identities": [
+            {
+              "name": "history_server_jhs",
+              "principal": {
+                "value": "jhs/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "mapred-site/mapreduce.jobhistory.principal",
+                "local_username": "${mapred-env/mapred_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/jhs.service.keytab",
+                "owner": {
+                  "name": "${mapred-env/mapred_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "mapred-site/mapreduce.jobhistory.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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/c689096d/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json.orig b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json.orig
new file mode 100644
index 0000000..73addb1
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json.orig
@@ -0,0 +1,226 @@
+{
+  "services": [
+    {
+      "name": "YARN",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "configurations": [
+        {
+          "yarn-site": {
+            "yarn.timeline-service.enabled": "true",
+            "yarn.timeline-service.http-authentication.type": "kerberos",
+            "yarn.acl.enable": "true",
+            "yarn.admin.acl": "${yarn-env/yarn_user},dr.who",
+            "yarn.timeline-service.http-authentication.signature.secret": "",
+            "yarn.timeline-service.http-authentication.signature.secret.file": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+            "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.kerberos.name.rules": "",
+            "yarn.resourcemanager.proxyusers.*.groups": "",
+            "yarn.resourcemanager.proxyusers.*.hosts": "",
+            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
+            "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
+            "hadoop.registry.secure" : "true",
+            "hadoop.registry.system.accounts" : "sasl:yarn,sasl:mapred,sasl:hadoop,sasl:hdfs,sasl:rm"
+          }
+        },
+        {
+          "core-site": {
+            "hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+            "hadoop.proxyuser.${yarn-env/yarn_user}.hosts": "${clusterHostInfo/rm_host}"
+          }
+        },
+        {
+          "capacity-scheduler": {
+            "yarn.scheduler.capacity.root.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "${yarn-env/yarn_user}"
+          }
+        }
+      ],
+      "components": [
+        {
+          "name": "NODEMANAGER",
+          "identities": [
+            {
+              "name": "nodemanager_nm",
+              "principal": {
+                "value": "nm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.nodemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/nm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.nodemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ],
+          "configurations": [
+            {
+              "yarn-site": {
+                "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+              }
+            }
+          ]
+        },
+        {
+          "name": "RESOURCEMANAGER",
+          "identities": [
+            {
+              "name": "resource_manager_rm",
+              "principal": {
+                "value": "rm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.resourcemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/rm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.resourcemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        },
+        {
+          "name": "APP_TIMELINE_SERVER",
+          "identities": [
+            {
+              "name": "app_timeline_server_yarn",
+              "principal": {
+                "value": "yarn/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.timeline-service.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/yarn.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.timeline-service.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MAPREDUCE2",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "components": [
+        {
+          "name": "HISTORYSERVER",
+          "identities": [
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "history_server_jhs",
+              "principal": {
+                "value": "jhs/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "mapred-site/mapreduce.jobhistory.principal",
+                "local_username": "${mapred-env/mapred_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/jhs.service.keytab",
+                "owner": {
+                  "name": "${mapred-env/mapred_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "mapred-site/mapreduce.jobhistory.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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/c689096d/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json.orig b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json.orig
new file mode 100644
index 0000000..d334887
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/YARN/kerberos.json.orig
@@ -0,0 +1,280 @@
+{
+  "services": [
+    {
+      "name": "YARN",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "configurations": [
+        {
+          "yarn-site": {
+            "yarn.timeline-service.enabled": "true",
+            "yarn.timeline-service.http-authentication.type": "kerberos",
+            "yarn.acl.enable": "true",
+            "yarn.admin.acl": "${yarn-env/yarn_user},dr.who",
+            "yarn.timeline-service.http-authentication.signature.secret": "",
+            "yarn.timeline-service.http-authentication.signature.secret.file": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+            "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.kerberos.name.rules": "",
+            "yarn.resourcemanager.proxyusers.*.groups": "",
+            "yarn.resourcemanager.proxyusers.*.hosts": "",
+            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
+            "yarn.resourcemanager.zk-acl" : "sasl:rm:rwcda",
+            "hadoop.registry.secure" : "true",
+            "hadoop.registry.system.accounts" : "sasl:yarn,sasl:mapred,sasl:hadoop,sasl:hdfs,sasl:rm"
+          }
+        },
+        {
+          "core-site": {
+            "hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+            "hadoop.proxyuser.${yarn-env/yarn_user}.hosts": "${clusterHostInfo/rm_host}"
+          }
+        },
+        {
+          "capacity-scheduler": {
+            "yarn.scheduler.capacity.root.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "${yarn-env/yarn_user}"
+          }
+        },
+        {
+          "ranger-yarn-audit": {
+            "xasecure.audit.jaas.Client.loginModuleName": "com.sun.security.auth.module.Krb5LoginModule",
+            "xasecure.audit.jaas.Client.loginModuleControlFlag": "required",
+            "xasecure.audit.jaas.Client.option.useKeyTab": "true",
+            "xasecure.audit.jaas.Client.option.storeKey": "false",
+            "xasecure.audit.jaas.Client.option.serviceName": "solr",
+            "xasecure.audit.destination.solr.force.use.inmemory.jaas.config": "true"
+          }
+        }
+      ],
+      "components": [
+        {
+          "name": "NODEMANAGER",
+          "identities": [
+            {
+              "name": "nodemanager_nm",
+              "principal": {
+                "value": "nm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.nodemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/nm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.nodemanager.keytab"
+              }
+            },
+            {
+              "name": "/HIVE/HIVE_SERVER/hive_server_hive",
+              "principal": {
+                "configuration": "hive-interactive-site/hive.llap.daemon.service.principal"
+              },
+              "keytab": {
+                "configuration": "hive-interactive-site/hive.llap.daemon.keytab.file"
+              },
+              "when" : {
+                "contains" : ["services", "HIVE"]
+              }
+            },
+            {
+              "name": "llap_zk_hive",
+              "principal": {
+                "value": "hive/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "hive-interactive-site/hive.llap.zk.sm.principal"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/hive.llap.zk.sm.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": "r"
+                },
+                "configuration": "hive-interactive-site/hive.llap.zk.sm.keytab.file"
+              },
+              "when" : {
+                "contains" : ["services", "HIVE"]
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ],
+          "configurations": [
+            {
+              "yarn-site": {
+                "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+              }
+            }
+          ]
+        },
+        {
+          "name": "RESOURCEMANAGER",
+          "identities": [
+            {
+              "name": "resource_manager_rm",
+              "principal": {
+                "value": "rm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.resourcemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/rm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.resourcemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file"
+              }
+            },
+            {
+              "name": "/YARN/RESOURCEMANAGER/resource_manager_rm",
+              "principal": {
+                "configuration": "ranger-yarn-audit/xasecure.audit.jaas.Client.option.principal"
+              },
+              "keytab": {
+                "configuration": "ranger-yarn-audit/xasecure.audit.jaas.Client.option.keyTab"
+              }
+            }
+          ]
+        },
+        {
+          "name": "APP_TIMELINE_SERVER",
+          "identities": [
+            {
+              "name": "app_timeline_server_yarn",
+              "principal": {
+                "value": "yarn/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.timeline-service.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/yarn.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.timeline-service.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MAPREDUCE2",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "components": [
+        {
+          "name": "HISTORYSERVER",
+          "identities": [
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "history_server_jhs",
+              "principal": {
+                "value": "jhs/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "mapred-site/mapreduce.jobhistory.principal",
+                "local_username": "${mapred-env/mapred_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/jhs.service.keytab",
+                "owner": {
+                  "name": "${mapred-env/mapred_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "mapred-site/mapreduce.jobhistory.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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/c689096d/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json.orig b/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json.orig
new file mode 100644
index 0000000..7e74237
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/YARN/kerberos.json.orig
@@ -0,0 +1,278 @@
+{
+  "services": [
+    {
+      "name": "YARN",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "configurations": [
+        {
+          "yarn-site": {
+            "yarn.timeline-service.enabled": "true",
+            "yarn.timeline-service.http-authentication.type": "kerberos",
+            "yarn.acl.enable": "true",
+            "yarn.admin.acl": "${yarn-env/yarn_user},dr.who",
+            "yarn.timeline-service.http-authentication.signature.secret": "",
+            "yarn.timeline-service.http-authentication.signature.secret.file": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider": "",
+            "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+            "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.kerberos.name.rules": "",
+            "yarn.resourcemanager.proxyusers.*.groups": "",
+            "yarn.resourcemanager.proxyusers.*.hosts": "",
+            "yarn.resourcemanager.proxyusers.*.users": "",
+            "yarn.resourcemanager.proxy-user-privileges.enabled": "true",
+            "yarn.resourcemanager.zk-state-store.parent-path": "/rmstore-secure"
+          }
+        },
+        {
+          "core-site": {
+            "hadoop.proxyuser.${yarn-env/yarn_user}.groups": "*",
+            "hadoop.proxyuser.${yarn-env/yarn_user}.hosts": "${clusterHostInfo/rm_host}"
+          }
+        },
+        {
+          "capacity-scheduler": {
+            "yarn.scheduler.capacity.root.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_queue": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_administer_jobs": "${yarn-env/yarn_user}",
+            "yarn.scheduler.capacity.root.default.acl_submit_applications": "${yarn-env/yarn_user}"
+          }
+        },
+        {
+          "ranger-yarn-audit": {
+            "xasecure.audit.jaas.Client.loginModuleName": "com.sun.security.auth.module.Krb5LoginModule",
+            "xasecure.audit.jaas.Client.loginModuleControlFlag": "required",
+            "xasecure.audit.jaas.Client.option.useKeyTab": "true",
+            "xasecure.audit.jaas.Client.option.storeKey": "false",
+            "xasecure.audit.jaas.Client.option.serviceName": "solr",
+            "xasecure.audit.destination.solr.force.use.inmemory.jaas.config": "true"
+          }
+        }
+      ],
+      "components": [
+        {
+          "name": "NODEMANAGER",
+          "identities": [
+            {
+              "name": "nodemanager_nm",
+              "principal": {
+                "value": "nm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.nodemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/nm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.nodemanager.keytab"
+              }
+            },
+            {
+              "name": "/HIVE/HIVE_SERVER/hive_server_hive",
+              "principal": {
+                "configuration": "hive-interactive-site/hive.llap.daemon.service.principal"
+              },
+              "keytab": {
+                "configuration": "hive-interactive-site/hive.llap.daemon.keytab.file"
+              },
+              "when" : {
+                "contains" : ["services", "HIVE"]
+              }
+            },
+            {
+              "name": "llap_zk_hive",
+              "principal": {
+                "value": "hive/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "hive-interactive-site/hive.llap.zk.sm.principal"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/hive.llap.zk.sm.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": "r"
+                },
+                "configuration": "hive-interactive-site/hive.llap.zk.sm.keytab.file"
+              },
+              "when" : {
+                "contains" : ["services", "HIVE"]
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file"
+              }
+            }
+          ],
+          "configurations": [
+            {
+              "yarn-site": {
+                "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+              }
+            }
+          ]
+        },
+        {
+          "name": "RESOURCEMANAGER",
+          "identities": [
+            {
+              "name": "resource_manager_rm",
+              "principal": {
+                "value": "rm/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.resourcemanager.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/rm.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.resourcemanager.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file"
+              }
+            },
+            {
+              "name": "/YARN/RESOURCEMANAGER/resource_manager_rm",
+              "principal": {
+                "configuration": "ranger-yarn-audit/xasecure.audit.jaas.Client.option.principal"
+              },
+              "keytab": {
+                "configuration": "ranger-yarn-audit/xasecure.audit.jaas.Client.option.keyTab"
+              }
+            }
+          ]
+        },
+        {
+          "name": "APP_TIMELINE_SERVER",
+          "identities": [
+            {
+              "name": "app_timeline_server_yarn",
+              "principal": {
+                "value": "yarn/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "yarn-site/yarn.timeline-service.principal",
+                "local_username": "${yarn-env/yarn_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/yarn.service.keytab",
+                "owner": {
+                  "name": "${yarn-env/yarn_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "yarn-site/yarn.timeline-service.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "MAPREDUCE2",
+      "identities": [
+        {
+          "name": "/spnego"
+        },
+        {
+          "name": "/smokeuser"
+        }
+      ],
+      "components": [
+        {
+          "name": "HISTORYSERVER",
+          "identities": [
+            {
+              "name": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "history_server_jhs",
+              "principal": {
+                "value": "jhs/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "mapred-site/mapreduce.jobhistory.principal",
+                "local_username": "${mapred-env/mapred_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/jhs.service.keytab",
+                "owner": {
+                  "name": "${mapred-env/mapred_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "mapred-site/mapreduce.jobhistory.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
+              },
+              "keytab": {
+                "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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", 


[3/5] ambari git commit: AMBARI-19337. Ambari has some spelling mistakes in YARN proxyuser properties in many places (Jay SenSharma via smohanty)

Posted by sm...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json.orig b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json.orig
new file mode 100644
index 0000000..bcc5359
--- /dev/null
+++ b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json.orig
@@ -0,0 +1,1320 @@
+{
+  "identities": [{
+    "principal": {
+      "type": "service",
+      "value": "HTTP/_HOST@${realm}"
+    },
+    "name": "spnego",
+    "keytab": {
+      "owner": {
+        "access": "r",
+        "name": "root"
+      },
+      "file": "${keytab_dir}/spnego.service.keytab",
+      "group": {
+        "access": "r",
+        "name": "${cluster-env/user_group}"
+      }
+    }
+  }, {
+    "principal": {
+      "configuration": "cluster-env/smokeuser_principal_name",
+      "type": "user",
+      "local_username": "${cluster-env/smokeuser}",
+      "value": "${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}"
+    },
+    "name": "smokeuser",
+    "keytab": {
+      "owner": {
+        "access": "r",
+        "name": "${cluster-env/smokeuser}"
+      },
+      "file": "${keytab_dir}/smokeuser.headless.keytab",
+      "configuration": "cluster-env/smokeuser_keytab",
+      "group": {
+        "access": "r",
+        "name": "${cluster-env/user_group}"
+      }
+    }
+  }],
+  "services": [{
+    "components": [{
+      "name": "MAHOUT"
+    }],
+    "identities": [{
+      "name": "/smokeuser"
+    }, {
+      "name": "/HDFS/hdfs"
+    }],
+    "name": "MAHOUT"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "mapred-site/mapreduce.jobhistory.principal",
+          "type": "service",
+          "local_username": "${mapred-env/mapred_user}",
+          "value": "jhs/_HOST@${realm}"
+        },
+        "name": "history_server_jhs",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${mapred-env/mapred_user}"
+          },
+          "file": "${keytab_dir}/jhs.service.keytab",
+          "configuration": "mapred-site/mapreduce.jobhistory.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "file": "${keytab_dir}/spnego.service.keytab",
+          "configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-keytab-file",
+          "group": {}
+        }
+      }],
+      "name": "HISTORYSERVER"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }, {
+      "name": "/HDFS/hdfs"
+    }, {
+      "name": "/smokeuser"
+    }],
+    "name": "MAPREDUCE2"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "oozie-site/oozie.service.HadoopAccessorService.kerberos.principal",
+          "type": "service",
+          "local_username": "${oozie-env/oozie_user}",
+          "value": "oozie/_HOST@${realm}"
+        },
+        "name": "oozie_server",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${oozie-env/oozie_user}"
+          },
+          "file": "${keytab_dir}/oozie.service.keytab",
+          "configuration": "oozie-site/oozie.service.HadoopAccessorService.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "oozie-site/oozie.authentication.kerberos.principal",
+          "type": "service"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "configuration": "oozie-site/oozie.authentication.kerberos.keytab",
+          "group": {}
+        }
+      }],
+      "name": "OOZIE_SERVER"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }, {
+      "name": "/smokeuser"
+    }, {
+      "name": "/HDFS/hdfs"
+    }],
+    "auth_to_local_properties": [
+      "oozie-site/oozie.authentication.kerberos.name.rules"
+    ],
+    "configurations": [{
+      "oozie-site": {
+        "oozie.service.HadoopAccessorService.kerberos.enabled": "true",
+        "oozie.authentication.type": "kerberos",
+        "oozie.service.AuthorizationService.authorization.enabled": "true",
+        "local.realm": "${realm}",
+        "oozie.credentials.credentialclasses": "hcat=org.apache.oozie.action.hadoop.HCatCredentials,hive2=org.apache.oozie.action.hadoop.Hive2Credentials"
+      }
+    }],
+    "name": "OOZIE"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "hdfs-site/dfs.secondary.namenode.kerberos.principal",
+          "type": "service",
+          "local_username": "${hadoop-env/hdfs_user}",
+          "value": "nn/_HOST@${realm}"
+        },
+        "name": "secondary_namenode_nn",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hadoop-env/hdfs_user}"
+          },
+          "file": "${keytab_dir}/nn.service.keytab",
+          "configuration": "hdfs-site/dfs.secondary.namenode.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "hdfs-site/dfs.secondary.namenode.kerberos.internal.spnego.principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego"
+      }],
+      "name": "SECONDARY_NAMENODE"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "hdfs-site/dfs.datanode.kerberos.principal",
+          "type": "service",
+          "local_username": "${hadoop-env/hdfs_user}",
+          "value": "dn/_HOST@${realm}"
+        },
+        "name": "datanode_dn",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hadoop-env/hdfs_user}"
+          },
+          "file": "${keytab_dir}/dn.service.keytab",
+          "configuration": "hdfs-site/dfs.datanode.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "configurations": [{
+        "hdfs-site": {
+          "dfs.datanode.address": "0.0.0.0:1019",
+          "dfs.datanode.http.address": "0.0.0.0:1022"
+        }
+      }],
+      "name": "DATANODE"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "hdfs-site/nfs.kerberos.principal",
+          "type": "service",
+          "local_username": "${hadoop-env/hdfs_user}",
+          "value": "nfs/_HOST@${realm}"
+        },
+        "name": "nfsgateway",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hadoop-env/hdfs_user}"
+          },
+          "file": "${keytab_dir}/nfs.service.keytab",
+          "configuration": "hdfs-site/nfs.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "NFS_GATEWAY"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "hdfs-site/dfs.journalnode.kerberos.principal",
+          "type": "service",
+          "local_username": "${hadoop-env/hdfs_user}",
+          "value": "jn/_HOST@${realm}"
+        },
+        "name": "journalnode_jn",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hadoop-env/hdfs_user}"
+          },
+          "file": "${keytab_dir}/jn.service.keytab",
+          "configuration": "hdfs-site/dfs.journalnode.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "hdfs-site/dfs.journalnode.kerberos.internal.spnego.principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego"
+      }],
+      "name": "JOURNALNODE"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "hdfs-site/dfs.namenode.kerberos.principal",
+          "type": "service",
+          "local_username": "${hadoop-env/hdfs_user}",
+          "value": "nn/_HOST@${realm}"
+        },
+        "name": "namenode_nn",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hadoop-env/hdfs_user}"
+          },
+          "file": "${keytab_dir}/nn.service.keytab",
+          "configuration": "hdfs-site/dfs.namenode.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "hdfs-site/dfs.namenode.kerberos.internal.spnego.principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego"
+      }],
+      "configurations": [{
+        "hdfs-site": {
+          "dfs.block.access.token.enable": "true"
+        }
+      }],
+      "name": "NAMENODE"
+    }],
+    "identities": [{
+      "principal": {
+        "configuration": "hdfs-site/dfs.web.authentication.kerberos.principal",
+        "type": "service",
+        "value": "HTTP/_HOST@${realm}"
+      },
+      "name": "/spnego",
+      "keytab": {
+        "owner": {},
+        "file": "${keytab_dir}/spnego.service.keytab",
+        "configuration": "hdfs-site/dfs.web.authentication.kerberos.keytab",
+        "group": {}
+      }
+    }, {
+      "name": "/smokeuser"
+    }, {
+      "principal": {
+        "configuration": "hadoop-env/hdfs_principal_name",
+        "type": "user",
+        "local_username": "${hadoop-env/hdfs_user}",
+        "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}"
+      },
+      "name": "hdfs",
+      "keytab": {
+        "owner": {
+          "access": "r",
+          "name": "${hadoop-env/hdfs_user}"
+        },
+        "file": "${keytab_dir}/hdfs.headless.keytab",
+        "configuration": "hadoop-env/hdfs_user_keytab",
+        "group": {
+          "access": "r",
+          "name": "${cluster-env/user_group}"
+        }
+      }
+    }],
+    "auth_to_local_properties": [
+      "core-site/hadoop.security.auth_to_local"
+    ],
+    "configurations": [{
+      "core-site": {
+        "hadoop.security.authorization": "true",
+        "hadoop.security.authentication": "kerberos",
+        "hadoop.proxyuser.HTTP.groups": "${hadoop-env/proxyuser_group}"
+      }
+    }],
+    "name": "HDFS"
+  }, {
+    "components": [{
+      "configurations": [{
+        "tez-site": {
+          "tez.am.view-acls": ""
+        }
+      }],
+      "name": "TEZ_CLIENT"
+    }],
+    "name": "TEZ"
+  }, {
+    "components": [{
+      "name": "SPARK_CLIENT"
+    }, {
+      "name": "SPARK_JOBHISTORYSERVER"
+    }],
+    "identities": [{
+      "name": "/smokeuser"
+    }, {
+      "name": "/HDFS/hdfs"
+    }, {
+      "principal": {
+        "configuration": "spark-defaults/spark.history.kerberos.principal",
+        "type": "user",
+        "local_username": "${spark-env/spark_user}",
+        "value": "${spark-env/spark_user}-${cluster_name|toLower()}@${realm}"
+      },
+      "name": "sparkuser",
+      "keytab": {
+        "owner": {
+          "access": "r",
+          "name": "${spark-env/spark_user}"
+        },
+        "file": "${keytab_dir}/spark.headless.keytab",
+        "configuration": "spark-defaults/spark.history.kerberos.keytab",
+        "group": {
+          "access": "",
+          "name": "${cluster-env/user_group}"
+        }
+      }
+    }],
+    "configurations": [{
+      "spark-defaults": {
+        "spark.history.kerberos.enabled": "true"
+      }
+    }],
+    "name": "SPARK"
+  }, {
+    "components": [{
+      "name": "ACCUMULO_MASTER"
+    }, {
+      "name": "ACCUMULO_MONITOR"
+    }, {
+      "name": "ACCUMULO_CLIENT"
+    }, {
+      "name": "ACCUMULO_TRACER"
+    }, {
+      "name": "ACCUMULO_TSERVER"
+    }, {
+      "name": "ACCUMULO_GC"
+    }],
+    "identities": [{
+      "principal": {
+        "configuration": "accumulo-env/accumulo_principal_name",
+        "type": "user",
+        "local_username": "${accumulo-env/accumulo_user}",
+        "value": "${accumulo-env/accumulo_user}-${cluster_name|toLower()}@${realm}"
+      },
+      "name": "accumulo",
+      "keytab": {
+        "owner": {
+          "access": "r",
+          "name": "${accumulo-env/accumulo_user}"
+        },
+        "file": "${keytab_dir}/accumulo.headless.keytab",
+        "configuration": "accumulo-env/accumulo_user_keytab",
+        "group": {
+          "access": "r",
+          "name": "${cluster-env/user_group}"
+        }
+      }
+    }, {
+      "principal": {
+        "configuration": "accumulo-site/general.kerberos.principal",
+        "type": "service",
+        "local_username": "${accumulo-env/accumulo_user}",
+        "value": "${accumulo-env/accumulo_user}/_HOST@${realm}"
+      },
+      "name": "accumulo_service",
+      "keytab": {
+        "owner": {
+          "access": "r",
+          "name": "${accumulo-env/accumulo_user}"
+        },
+        "file": "${keytab_dir}/accumulo.service.keytab",
+        "configuration": "accumulo-site/general.kerberos.keytab",
+        "group": {
+          "access": "",
+          "name": "${cluster-env/user_group}"
+        }
+      }
+    }, {
+      "principal": {
+        "configuration": "accumulo-site/trace.user",
+        "type": "user",
+        "local_username": "${accumulo-env/accumulo_user}",
+        "value": "tracer-${cluster_name|toLower()}@${realm}"
+      },
+      "name": "accumulo_tracer",
+      "keytab": {
+        "owner": {
+          "access": "r",
+          "name": "${accumulo-env/accumulo_user}"
+        },
+        "file": "${keytab_dir}/accumulo-tracer.headless.keytab",
+        "configuration": "accumulo-site/trace.token.property.keytab",
+        "group": {
+          "access": "",
+          "name": "${cluster-env/user_group}"
+        }
+      }
+    }, {
+      "name": "/HDFS/hdfs"
+    }, {
+      "name": "/smokeuser"
+    }],
+    "configurations": [{
+      "accumulo-site": {
+        "instance.security.authenticator": "org.apache.accumulo.server.security.handler.KerberosAuthenticator",
+        "instance.rpc.sasl.enabled": "true",
+        "general.delegation.token.lifetime": "7d",
+        "trace.token.type": "org.apache.accumulo.core.client.security.tokens.KerberosToken",
+        "instance.security.permissionHandler": "org.apache.accumulo.server.security.handler.KerberosPermissionHandler",
+        "general.delegation.token.update.interval": "1d",
+        "instance.security.authorizor": "org.apache.accumulo.server.security.handler.KerberosAuthorizor"
+      }
+    }],
+    "name": "ACCUMULO"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "zookeeper-env/zookeeper_principal_name",
+          "type": "service",
+          "value": "zookeeper/_HOST@${realm}"
+        },
+        "name": "zookeeper_zk",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${zookeeper-env/zk_user}"
+          },
+          "file": "${keytab_dir}/zk.service.keytab",
+          "configuration": "zookeeper-env/zookeeper_keytab_path",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "ZOOKEEPER_SERVER"
+    }],
+    "identities": [{
+      "name": "/smokeuser"
+    }],
+    "name": "ZOOKEEPER"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "hbase-site/hbase.regionserver.kerberos.principal",
+          "type": "service",
+          "local_username": "${hbase-env/hbase_user}",
+          "value": "hbase/_HOST@${realm}"
+        },
+        "name": "hbase_regionserver_hbase",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hbase-env/hbase_user}"
+          },
+          "file": "${keytab_dir}/hbase.service.keytab",
+          "configuration": "hbase-site/hbase.regionserver.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "HBASE_REGIONSERVER"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "hbase-site/hbase.master.kerberos.principal",
+          "type": "service",
+          "local_username": "${hbase-env/hbase_user}",
+          "value": "hbase/_HOST@${realm}"
+        },
+        "name": "hbase_master_hbase",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hbase-env/hbase_user}"
+          },
+          "file": "${keytab_dir}/hbase.service.keytab",
+          "configuration": "hbase-site/hbase.master.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "HBASE_MASTER"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "hbase-site/phoenix.queryserver.kerberos.principal",
+          "type": "service",
+          "local_username": "${hbase-env/hbase_user}",
+          "value": "hbase/_HOST@${realm}"
+        },
+        "name": "hbase_queryserver_hbase",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hbase-env/hbase_user}"
+          },
+          "file": "${keytab_dir}/hbase.service.keytab",
+          "configuration": "hbase-site/phoenix.queryserver.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "PHOENIX_QUERY_SERVER"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }, {
+      "name": "/HDFS/hdfs"
+    }, {
+      "principal": {
+        "configuration": "hbase-env/hbase_principal_name",
+        "type": "user",
+        "local_username": "${hbase-env/hbase_user}",
+        "value": "${hbase-env/hbase_user}-${cluster_name|toLower()}@${realm}"
+      },
+      "name": "hbase",
+      "keytab": {
+        "owner": {
+          "access": "r",
+          "name": "${hbase-env/hbase_user}"
+        },
+        "file": "${keytab_dir}/hbase.headless.keytab",
+        "configuration": "hbase-env/hbase_user_keytab",
+        "group": {
+          "access": "r",
+          "name": "${cluster-env/user_group}"
+        }
+      }
+    }, {
+      "name": "/smokeuser"
+    }],
+    "configurations": [{
+      "hbase-site": {
+        "hbase.coprocessor.master.classes": "{{hbase_coprocessor_master_classes}}",
+        "hbase.security.authentication": "kerberos",
+        "hbase.coprocessor.region.classes": "{{hbase_coprocessor_region_classes}}",
+        "hbase.security.authorization": "true",
+        "hbase.bulkload.staging.dir": "/apps/hbase/staging",
+        "zookeeper.znode.parent": "/hbase-secure"
+      }
+    }],
+    "name": "HBASE"
+  }, {
+    "components": [{
+      "name": "KERBEROS_CLIENT"
+    }],
+    "identities": [{
+      "name": "/smokeuser"
+    }],
+    "name": "KERBEROS"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "kms-site/hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal",
+          "type": "service"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "configuration": "kms-site/hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab",
+          "group": {}
+        }
+      }, {
+        "name": "/smokeuser"
+      }],
+      "name": "RANGER_KMS_SERVER"
+    }],
+    "identities": [{
+      "name": "/spnego",
+      "keytab": {
+        "owner": {},
+        "configuration": "kms-site/hadoop.kms.authentication.kerberos.keytab",
+        "group": {}
+      }
+    }, {
+      "name": "/smokeuser"
+    }],
+    "configurations": [{
+      "kms-site": {
+        "hadoop.kms.authentication.kerberos.principal": "*",
+        "hadoop.kms.authentication.type": "kerberos"
+      }
+    }],
+    "name": "RANGER_KMS"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "yarn-site/yarn.nodemanager.principal",
+          "type": "service",
+          "local_username": "${yarn-env/yarn_user}",
+          "value": "nm/_HOST@${realm}"
+        },
+        "name": "nodemanager_nm",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${yarn-env/yarn_user}"
+          },
+          "file": "${keytab_dir}/nm.service.keytab",
+          "configuration": "yarn-site/yarn.nodemanager.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "file": "${keytab_dir}/spnego.service.keytab",
+          "configuration": "yarn-site/yarn.nodemanager.webapp.spnego-keytab-file",
+          "group": {}
+        }
+      }],
+      "configurations": [{
+        "yarn-site": {
+          "yarn.nodemanager.container-executor.class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor"
+        }
+      }],
+      "name": "NODEMANAGER"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "yarn-site/yarn.timeline-service.principal",
+          "type": "service",
+          "local_username": "${yarn-env/yarn_user}",
+          "value": "yarn/_HOST@${realm}"
+        },
+        "name": "app_timeline_server_yarn",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${yarn-env/yarn_user}"
+          },
+          "file": "${keytab_dir}/yarn.service.keytab",
+          "configuration": "yarn-site/yarn.timeline-service.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "file": "${keytab_dir}/spnego.service.keytab",
+          "configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.keytab",
+          "group": {}
+        }
+      }],
+      "name": "APP_TIMELINE_SERVER"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "yarn-site/yarn.resourcemanager.principal",
+          "type": "service",
+          "local_username": "${yarn-env/yarn_user}",
+          "value": "rm/_HOST@${realm}"
+        },
+        "name": "resource_manager_rm",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${yarn-env/yarn_user}"
+          },
+          "file": "${keytab_dir}/rm.service.keytab",
+          "configuration": "yarn-site/yarn.resourcemanager.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "file": "${keytab_dir}/spnego.service.keytab",
+          "configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-keytab-file",
+          "group": {}
+        }
+      }],
+      "name": "RESOURCEMANAGER"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }, {
+      "name": "/HDFS/hdfs"
+    }, {
+      "name": "/smokeuser"
+    }],
+    "configurations": [{
+      "capacity-scheduler": {
+        "yarn.scheduler.capacity.root.default.acl_administer_queue": "${yarn-env/yarn_user}",
+        "yarn.scheduler.capacity.root.acl_administer_queue": "${yarn-env/yarn_user}",
+        "yarn.scheduler.capacity.root.default.acl_administer_jobs": "${yarn-env/yarn_user}",
+        "yarn.scheduler.capacity.root.acl_administer_jobs": "${yarn-env/yarn_user}",
+        "yarn.scheduler.capacity.root.default.acl_submit_applications": "${yarn-env/yarn_user}"
+      }
+    }, {
+      "yarn-site": {
+        "yarn.timeline-service.http-authentication.signer.secret.provider.object": "",
+        "yarn.resourcemanager.proxyusers.*.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": "",
+        "yarn.timeline-service.http-authentication.cookie.path": "",
+        "yarn.timeline-service.http-authentication.type": "kerberos",
+        "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.signature.secret": "",
+        "yarn.timeline-service.http-authentication.signature.secret.file": "",
+        "yarn.resourcemanager.proxyusers.*.hosts": "",
+        "yarn.resourcemanager.proxyusers.*.groups": "",
+        "yarn.timeline-service.enabled": "true",
+        "yarn.timeline-service.http-authentication.proxyusers.*.users": "",
+        "yarn.timeline-service.http-authentication.cookie.domain": ""
+      }
+    }, {
+      "core-site": {
+        "hadoop.proxyuser.yarn.groups": "*",
+        "hadoop.proxyuser.yarn.hosts": "${yarn-site/yarn.resourcemanager.hostname}"
+      }
+    }],
+    "name": "YARN"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "knox-env/knox_principal_name",
+          "type": "service",
+          "local_username": "${knox-env/knox_user}",
+          "value": "${knox-env/knox_user}/_HOST@${realm}"
+        },
+        "name": "knox_principal",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${knox-env/knox_user}"
+          },
+          "file": "${keytab_dir}/knox.service.keytab",
+          "configuration": "knox-env/knox_keytab_path",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "configurations": [{
+        "oozie-site": {
+          "oozie.service.ProxyUserService.proxyuser.${knox-env/knox_user}.groups": "${hadoop-env/proxyuser_group}",
+          "oozie.service.ProxyUserService.proxyuser.${knox-env/knox_user}.hosts": "${clusterHostInfo/knox_gateway_hosts}"
+        }
+      }, {
+        "webhcat-site": {
+          "webhcat.proxyuser.${knox-env/knox_user}.groups": "${hadoop-env/proxyuser_group}",
+          "webhcat.proxyuser.${knox-env/knox_user}.hosts": "${clusterHostInfo/knox_gateway_hosts}"
+        }
+      }, {
+        "gateway-site": {
+          "gateway.hadoop.kerberos.secured": "true",
+          "java.security.krb5.conf": "/etc/krb5.conf"
+        }
+      }, {
+        "core-site": {
+          "hadoop.proxyuser.${knox-env/knox_user}.hosts": "${clusterHostInfo/knox_gateway_hosts}",
+          "hadoop.proxyuser.${knox-env/knox_user}.groups": "${hadoop-env/proxyuser_group}"
+        }
+      }],
+      "name": "KNOX_GATEWAY"
+    }],
+    "name": "KNOX"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "storm-env/storm_ui_principal_name",
+          "type": "service"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "configuration": "storm-env/storm_ui_keytab",
+          "group": {}
+        }
+      }],
+      "name": "STORM_UI_SERVER"
+    }, {
+      "name": "SUPERVISOR"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "storm-env/nimbus_principal_name",
+          "type": "service",
+          "value": "nimbus/_HOST@${realm}"
+        },
+        "name": "nimbus_server",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${storm-env/storm_user}"
+          },
+          "file": "${keytab_dir}/nimbus.service.keytab",
+          "configuration": "storm-env/nimbus_keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "NIMBUS"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "storm-env/nimbus_principal_name",
+          "type": "service",
+          "value": "nimbus/_HOST@${realm}"
+        },
+        "name": "nimbus_server",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${storm-env/storm_user}"
+          },
+          "file": "${keytab_dir}/nimbus.service.keytab",
+          "configuration": "storm-env/nimbus_keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "DRPC_SERVER"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }, {
+      "name": "/smokeuser"
+    }, {
+      "principal": {
+        "configuration": "storm-env/storm_principal_name",
+        "type": "user",
+        "value": "${storm-env/storm_user}-${cluster_name|toLower()}@${realm}"
+      },
+      "name": "storm_components",
+      "keytab": {
+        "owner": {
+          "access": "r",
+          "name": "${storm-env/storm_user}"
+        },
+        "file": "${keytab_dir}/storm.headless.keytab",
+        "configuration": "storm-env/storm_keytab",
+        "group": {
+          "access": "",
+          "name": "${cluster-env/user_group}"
+        }
+      }
+    }],
+    "configurations": [{
+      "storm-site": {
+        "nimbus.authorizer": "backtype.storm.security.auth.authorizer.SimpleACLAuthorizer",
+        "java.security.auth.login.config": "{{conf_dir}}/storm_jaas.conf",
+        "drpc.authorizer": "backtype.storm.security.auth.authorizer.DRPCSimpleACLAuthorizer",
+        "storm.principal.tolocal": "backtype.storm.security.auth.KerberosPrincipalToLocal",
+        "storm.zookeeper.superACL": "sasl:{{storm_bare_jaas_principal}}",
+        "ui.filter.params": "{'type': 'kerberos', 'kerberos.principal': '{{storm_ui_jaas_principal}}', 'kerberos.keytab': '{{storm_ui_keytab_path}}', 'kerberos.name.rules': 'DEFAULT'}",
+        "nimbus.supervisor.users": "['{{storm_bare_jaas_principal}}']",
+        "nimbus.admins": "['{{storm_bare_jaas_principal}}']",
+        "ui.filter": "org.apache.hadoop.security.authentication.server.AuthenticationFilter",
+        "supervisor.enable": "true"
+      }
+    }],
+    "name": "STORM"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "application-properties/atlas.authentication.principal",
+          "type": "service",
+          "local_username": "${atlas-env/metadata_user}",
+          "value": "atlas/_HOST@${realm}"
+        },
+        "name": "atlas",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${atlas-env/metadata_user}"
+          },
+          "file": "${keytab_dir}/atlas.service.keytab",
+          "configuration": "application-properties/atlas.authentication.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "application-properties/atlas.http.authentication.kerberos.principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "configuration": "application-properties/atlas.http.authentication.kerberos.keytab",
+          "group": {}
+        }
+      }],
+      "name": "ATLAS_SERVER"
+    }],
+    "auth_to_local_properties": [
+      "application-properties/atlas.http.authentication.kerberos.name.rules|new_lines_escaped"
+    ],
+    "configurations": [{
+      "application-properties": {
+        "atlas.authentication.method": "kerberos",
+        "atlas.http.authentication.enabled": "true",
+        "atlas.http.authentication.type": "kerberos"
+      }
+    }],
+    "name": "ATLAS"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "hive-site/hive.server2.authentication.kerberos.principal",
+          "type": "service",
+          "local_username": "${hive-env/hive_user}",
+          "value": "hive/_HOST@${realm}"
+        },
+        "name": "hive_server_hive",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hive-env/hive_user}"
+          },
+          "file": "${keytab_dir}/hive.service.keytab",
+          "configuration": "hive-site/hive.server2.authentication.kerberos.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "hive-site/hive.server2.authentication.spnego.principal",
+          "type": "service"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "configuration": "hive-site/hive.server2.authentication.spnego.keytab",
+          "group": {}
+        }
+      }],
+      "name": "HIVE_SERVER"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "hive-site/hive.metastore.kerberos.principal",
+          "type": "service",
+          "local_username": "${hive-env/hive_user}",
+          "value": "hive/_HOST@${realm}"
+        },
+        "name": "hive_metastore_hive",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${hive-env/hive_user}"
+          },
+          "file": "${keytab_dir}/hive.service.keytab",
+          "configuration": "hive-site/hive.metastore.kerberos.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "HIVE_METASTORE"
+    }, {
+      "identities": [{
+        "principal": {
+          "configuration": "webhcat-site/templeton.kerberos.principal",
+          "type": "service"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "configuration": "webhcat-site/templeton.kerberos.keytab",
+          "group": {}
+        }
+      }],
+      "name": "WEBHCAT_SERVER"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }, {
+      "name": "/smokeuser"
+    }],
+    "configurations": [{
+      "hive-site": {
+        "hive.metastore.sasl.enabled": "true",
+        "hive.server2.authentication": "KERBEROS"
+      }
+    }, {
+      "webhcat-site": {
+        "templeton.hive.properties": "hive.metastore.local=false,hive.metastore.uris=${clusterHostInfo/hive_metastore_host|each(thrift://%s:9083, \\\\,, \\s*\\,\\s*)},hive.metastore.sasl.enabled=true,hive.metastore.execute.setugi=true,hive.metastore.warehouse.dir=/apps/hive/warehouse,hive.exec.mode.local.auto=false,hive.metastore.kerberos.principal=hive/_HOST@${realm}",
+        "templeton.kerberos.secret": "secret"
+      }
+    }, {
+      "core-site": {
+        "hadoop.proxyuser.HTTP.hosts": "${clusterHostInfo/webhcat_server_host}"
+      }
+    }],
+    "name": "HIVE"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "ams-hbase-security-site/hbase.master.kerberos.principal",
+          "type": "service",
+          "local_username": "${ams-env/ambari_metrics_user}",
+          "value": "amshbasemaster/_HOST@${realm}"
+        },
+        "name": "ams_hbase_master_hbase",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${ams-env/ambari_metrics_user}"
+          },
+          "file": "${keytab_dir}/ams-hbase.master.keytab",
+          "configuration": "ams-hbase-security-site/hbase.master.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "ams-hbase-security-site/hbase.regionserver.kerberos.principal",
+          "type": "service",
+          "local_username": "${ams-env/ambari_metrics_user}",
+          "value": "amshbasers/_HOST@${realm}"
+        },
+        "name": "ams_hbase_regionserver_hbase",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${ams-env/ambari_metrics_user}"
+          },
+          "file": "${keytab_dir}/ams-hbase.regionserver.keytab",
+          "configuration": "ams-hbase-security-site/hbase.regionserver.keytab.file",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "ams-hbase-security-site/hbase.myclient.principal",
+          "type": "service",
+          "local_username": "${ams-env/ambari_metrics_user}",
+          "value": "amshbase/_HOST@${realm}"
+        },
+        "name": "ams_collector",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${ams-env/ambari_metrics_user}"
+          },
+          "file": "${keytab_dir}/ams.collector.keytab",
+          "configuration": "ams-hbase-security-site/hbase.myclient.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "ams-hbase-security-site/ams.zookeeper.principal",
+          "type": "service",
+          "local_username": "${ams-env/ambari_metrics_user}",
+          "value": "amszk/_HOST@${realm}"
+        },
+        "name": "ams_zookeeper",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${ams-env/ambari_metrics_user}"
+          },
+          "file": "${keytab_dir}/ams-zk.service.keytab",
+          "configuration": "ams-hbase-security-site/ams.zookeeper.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "configurations": [{
+        "ams-hbase-security-site": {
+          "hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController",
+          "hadoop.security.authentication": "kerberos",
+          "hbase.security.authentication": "kerberos",
+          "hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.AccessController",
+          "hbase.security.authorization": "true",
+          "hbase.zookeeper.property.kerberos.removeRealmFromPrincipal": "true",
+          "hbase.zookeeper.property.jaasLoginRenew": "3600000",
+          "hbase.zookeeper.property.authProvider.1": "org.apache.zookeeper.server.auth.SASLAuthenticationProvider",
+          "hbase.zookeeper.property.kerberos.removeHostFromPrincipal": "true"
+        }
+      },
+        {
+          "ams-hbase-site": {
+            "zookeeper.znode.parent": "/ams-hbase-secure"
+          }
+        }
+      ],
+      "name": "METRICS_COLLECTOR"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }],
+    "name": "AMBARI_METRICS"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "kafka-env/kafka_principal_name",
+          "type": "service",
+          "value": "${kafka-env/kafka_user}/_HOST@${realm}"
+        },
+        "name": "kafka_broker",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${kafka-env/kafka_user}"
+          },
+          "file": "${keytab_dir}/kafka.service.keytab",
+          "configuration": "kafka-env/kafka_keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }],
+      "name": "KAFKA_BROKER"
+    }],
+    "identities": [{
+      "name": "/smokeuser"
+    }],
+    "configurations": [{
+      "kafka-broker": {
+        "principal.to.local.class": "kafka.security.auth.KerberosPrincipalToLocal",
+        "authorizer.class.name": "kafka.security.auth.SimpleAclAuthorizer",
+        "super.users": "user:${kafka-env/kafka_user}",
+        "security.inter.broker.protocol": "PLAINTEXTSASL"
+      }
+    }],
+    "name": "KAFKA"
+  }, {
+    "components": [{
+      "identities": [{
+        "principal": {
+          "configuration": "falcon-startup.properties/*.falcon.service.authentication.kerberos.principal",
+          "type": "service",
+          "local_username": "${falcon-env/falcon_user}",
+          "value": "falcon/_HOST@${realm}"
+        },
+        "name": "falcon_server",
+        "keytab": {
+          "owner": {
+            "access": "r",
+            "name": "${falcon-env/falcon_user}"
+          },
+          "file": "${keytab_dir}/falcon.service.keytab",
+          "configuration": "falcon-startup.properties/*.falcon.service.authentication.kerberos.keytab",
+          "group": {
+            "access": "",
+            "name": "${cluster-env/user_group}"
+          }
+        }
+      }, {
+        "principal": {
+          "configuration": "falcon-startup.properties/*.falcon.http.authentication.kerberos.principal",
+          "type": "service",
+          "value": "HTTP/_HOST@${realm}"
+        },
+        "name": "/spnego",
+        "keytab": {
+          "owner": {},
+          "configuration": "falcon-startup.properties/*.falcon.http.authentication.kerberos.keytab",
+          "group": {}
+        }
+      }],
+      "name": "FALCON_SERVER"
+    }],
+    "identities": [{
+      "name": "/spnego"
+    }, {
+      "name": "/smokeuser"
+    }, {
+      "name": "/HDFS/hdfs"
+    }],
+    "auth_to_local_properties": [
+      "falcon-startup.properties/*.falcon.http.authentication.kerberos.name.rules|new_lines_escaped"
+    ],
+    "configurations": [{
+      "falcon-startup.properties": {
+        "*.dfs.namenode.kerberos.principal": "nn/_HOST@${realm}",
+        "*.falcon.http.authentication.type": "kerberos",
+        "*.falcon.authentication.type": "kerberos"
+      }
+    }],
+    "name": "FALCON"
+  }],
+  "properties": {
+    "additional_realms": "",
+    "keytab_dir": "/etc/security/keytabs",
+    "realm": "EXAMPLE.COM"
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/c689096d/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" : ""
               }
             }