ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-6512. Use security properties from -env (aonishuk)
Date Wed, 16 Jul 2014 17:45:58 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 298bb53d6 -> c13dad9a1


AMBARI-6512. Use security properties from -env (aonishuk)


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

Branch: refs/heads/trunk
Commit: c13dad9a1a93b913a8067527289f8b0e38560fbb
Parents: 298bb53
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Wed Jul 16 20:45:56 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Wed Jul 16 20:45:56 2014 +0300

----------------------------------------------------------------------
 .../services/HBASE/package/scripts/params.py    |   2 +-
 .../services/NAGIOS/package/scripts/params.py   |   4 +-
 .../services/OOZIE/package/scripts/params.py    |   2 +-
 .../ZOOKEEPER/package/scripts/params.py         |   4 +-
 .../services/HBASE/package/scripts/params.py    |   2 +-
 .../services/NAGIOS/package/scripts/params.py   |   4 +-
 .../services/OOZIE/package/scripts/params.py    |   2 +-
 .../ZOOKEEPER/package/scripts/params.py         |   4 +-
 .../services/STORM/package/scripts/params.py    |   4 +-
 .../python/stacks/1.3.2/configs/secured.json    |  53 +----
 .../python/stacks/2.0.6/configs/secured.json    |  86 +------
 .../test/python/stacks/2.1/configs/default.json |   8 +
 .../test/python/stacks/2.1/configs/secured.json | 237 ++-----------------
 13 files changed, 70 insertions(+), 342 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
index 9b61365..a9e51b5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py
@@ -76,7 +76,7 @@ if security_enabled:
 master_keytab_path = config['configurations']['hbase-site']['hbase.master.keytab.file']
 regionserver_keytab_path = config['configurations']['hbase-site']['hbase.regionserver.keytab.file']
 smoke_user_keytab = config['configurations']['hadoop-env']['smokeuser_keytab']
-hbase_user_keytab = config['configurations']['hadoop-env']['hbase_user_keytab']
+hbase_user_keytab = config['configurations']['hbase-env']['hbase_user_keytab']
 kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 if security_enabled:
   kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_user};")

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
index 282beb5..c721454 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py
@@ -45,7 +45,7 @@ nagios_servicegroup_cfg = format("{nagios_obj_dir}/hadoop-servicegroups.cfg")
 nagios_service_cfg = format("{nagios_obj_dir}/hadoop-services.cfg")
 nagios_command_cfg = format("{nagios_obj_dir}/hadoop-commands.cfg")
 eventhandlers_dir = "/usr/lib/nagios/eventhandlers"
-nagios_principal_name = default("/configurations/hadoop-env/nagios_principal_name", "nagios")
+nagios_principal_name = default("/configurations/nagios-env/nagios_principal_name", "nagios")
 hadoop_ssl_enabled = False
 
 namenode_metadata_port = get_port_from_url(config['configurations']['core-site']['fs.default.name'])
@@ -82,7 +82,7 @@ check_cpu_on = is_jdk_greater_6(java64_home)
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']
 security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos')
 
-nagios_keytab_path = default("/configurations/hadoop-env/nagios_keytab_path", "/etc/security/keytabs/nagios.service.keytab")
+nagios_keytab_path = default("/configurations/nagios-env/nagios_keytab_path", "/etc/security/keytabs/nagios.service.keytab")
 kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 
 ganglia_port = "8651"

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
index 7072ab2..9ecdfa3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/OOZIE/package/scripts/params.py
@@ -50,7 +50,7 @@ kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/
 oozie_service_keytab = config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.keytab.file']
 oozie_principal = config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.kerberos.principal']
 smokeuser_keytab = config['configurations']['hadoop-env']['smokeuser_keytab']
-oozie_keytab = config['configurations']['hadoop-env']['oozie_keytab']
+oozie_keytab = config['configurations']['oozie-env']['oozie_keytab']
 
 oracle_driver_jar_name = "ojdbc6.jar"
 java_share_dir = "/usr/share/java"

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
index 316dbff..fa561f0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/package/scripts/params.py
@@ -51,7 +51,7 @@ else:
   zoo_cfg_properties_map = {}
 zoo_cfg_properties_map_length = len(zoo_cfg_properties_map)
 
-zk_principal_name = default("/configurations/hadoop-env/zookeeper_principal_name", "zookeeper@EXAMPLE.COM")
+zk_principal_name = default("/configurations/zookeeper-env/zookeeper_principal_name", "zookeeper@EXAMPLE.COM")
 zk_principal = zk_principal_name.replace('_HOST',hostname.lower())
 
 java64_home = config['hostLevelParams']['java_home']
@@ -59,7 +59,7 @@ java64_home = config['hostLevelParams']['java_home']
 zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts']
 zookeeper_hosts.sort()
 
-zk_keytab_path = config['configurations']['hadoop-env']['zookeeper_keytab_path']
+zk_keytab_path = config['configurations']['zookeeper-env']['zookeeper_keytab_path']
 zk_server_jaas_file = format("{config_dir}/zookeeper_jaas.conf")
 zk_client_jaas_file = format("{config_dir}/zookeeper_client_jaas.conf")
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
index 7b15d5e..1c37482 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
@@ -82,7 +82,7 @@ if security_enabled:
 master_keytab_path = config['configurations']['hbase-site']['hbase.master.keytab.file']
 regionserver_keytab_path = config['configurations']['hbase-site']['hbase.regionserver.keytab.file']
 smoke_user_keytab = config['configurations']['hadoop-env']['smokeuser_keytab']
-hbase_user_keytab = config['configurations']['hadoop-env']['hbase_user_keytab']
+hbase_user_keytab = config['configurations']['hbase-env']['hbase_user_keytab']
 kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 if security_enabled:
   kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_user};")

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
index 249da3b..9365922 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
@@ -79,7 +79,7 @@ nagios_servicegroup_cfg = format("{nagios_obj_dir}/hadoop-servicegroups.cfg")
 nagios_service_cfg = format("{nagios_obj_dir}/hadoop-services.cfg")
 nagios_command_cfg = format("{nagios_obj_dir}/hadoop-commands.cfg")
 eventhandlers_dir = "/usr/lib/nagios/eventhandlers"
-nagios_principal_name = default("/configurations/hadoop-env/nagios_principal_name", "nagios")
+nagios_principal_name = default("/configurations/nagios-env/nagios_principal_name", "nagios")
 hadoop_ssl_enabled = False
 
 oozie_server_port = get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
@@ -139,7 +139,7 @@ check_cpu_on = is_jdk_greater_6(java64_home)
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']
 security_enabled = ( not is_empty(_authentication) and _authentication == 'kerberos')
 
-nagios_keytab_path = default("/configurations/hadoop-env/nagios_keytab_path", "/etc/security/keytabs/nagios.service.keytab")
+nagios_keytab_path = default("/configurations/nagios-env/nagios_keytab_path", "/etc/security/keytabs/nagios.service.keytab")
 kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 
 dfs_ha_enabled = False

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
index ad5632e..e8292b6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py
@@ -48,7 +48,7 @@ kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/
 oozie_service_keytab = config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.keytab.file']
 oozie_principal = config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.kerberos.principal']
 smokeuser_keytab = config['configurations']['hadoop-env']['smokeuser_keytab']
-oozie_keytab = config['configurations']['hadoop-env']['oozie_keytab']
+oozie_keytab = config['configurations']['oozie-env']['oozie_keytab']
 oozie_env_sh_template = config['configurations']['oozie-env']['content']
 
 oracle_driver_jar_name = "ojdbc6.jar"

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
index 316dbff..fa561f0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/package/scripts/params.py
@@ -51,7 +51,7 @@ else:
   zoo_cfg_properties_map = {}
 zoo_cfg_properties_map_length = len(zoo_cfg_properties_map)
 
-zk_principal_name = default("/configurations/hadoop-env/zookeeper_principal_name", "zookeeper@EXAMPLE.COM")
+zk_principal_name = default("/configurations/zookeeper-env/zookeeper_principal_name", "zookeeper@EXAMPLE.COM")
 zk_principal = zk_principal_name.replace('_HOST',hostname.lower())
 
 java64_home = config['hostLevelParams']['java_home']
@@ -59,7 +59,7 @@ java64_home = config['hostLevelParams']['java_home']
 zookeeper_hosts = config['clusterHostInfo']['zookeeper_hosts']
 zookeeper_hosts.sort()
 
-zk_keytab_path = config['configurations']['hadoop-env']['zookeeper_keytab_path']
+zk_keytab_path = config['configurations']['zookeeper-env']['zookeeper_keytab_path']
 zk_server_jaas_file = format("{config_dir}/zookeeper_jaas.conf")
 zk_client_jaas_file = format("{config_dir}/zookeeper_client_jaas.conf")
 _authentication = config['configurations']['core-site']['hadoop.security.authentication']

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
index daa6c1d..b4416f4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/package/scripts/params.py
@@ -55,6 +55,6 @@ security_enabled = ( not is_empty(_authentication) and _authentication == 'kerbe
 if security_enabled:
   _hostname_lowercase = config['hostname'].lower()
   _kerberos_domain = config['configurations']['hadoop-env']['kerberos_domain']
-  _storm_principal_name = config['configurations']['hadoop-env']['storm_principal_name']
+  _storm_principal_name = config['configurations']['storm-env']['storm_principal_name']
   storm_jaas_principal = _storm_principal_name.replace('_HOST',_hostname_lowercase)
-  storm_keytab_path = config['configurations']['hadoop-env']['storm_keytab']
+  storm_keytab_path = config['configurations']['storm-env']['storm_keytab']

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
index 17743b9..35f6202 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/1.3.2/configs/secured.json
@@ -465,7 +465,8 @@
             "oozie_user": "oozie", 
             "oozie_database": "New Derby Database", 
             "oozie_data_dir": "/hadoop/oozie/data", 
-            "oozie_log_dir": "/var/log/oozie"
+            "oozie_log_dir": "/var/log/oozie",
+            "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab"
         }, 
         "pig-env": {
             "content": "\nJAVA_HOME={{java64_home}}\nHADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n    "
@@ -506,7 +507,9 @@
             "nagios_user": "nagios", 
             "nagios_group": "nagios", 
             "nagios_web_login": "nagiosadmin", 
-            "nagios_contact": "user@com.ua"
+            "nagios_contact": "user@com.ua",
+            "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
+            "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab"
         }, 
         "hive-env": {
             "hive_metastore_user_passwd": "password", 
@@ -527,7 +530,7 @@
             "hive_database": "New MySQL Database"
         }, 
         "hadoop-env": {
-            "security_enabled": "false", 
+            "security_enabled": "true", 
             "namenode_opt_maxnewsize": "200m", 
             "hdfs_log_dir_prefix": "/var/log/hadoop", 
             "ignore_groupsusers_create": "false", 
@@ -542,41 +545,8 @@
             "smokeuser": "ambari-qa", 
             "hadoop_heapsize": "1024", 
             "hadoop_pid_dir_prefix": "/var/run/hadoop",
-            "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab", 
-            "hadoop_http_principal_name": "HTTP/_HOST", 
-            "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab", 
-            "namenode_principal_name": "nn/_HOST", 
-            "namenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM", 
-            "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab", 
-            "hbase_master_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "jobtracker_principal_name": "jt/_HOST", 
-            "datanode_principal_name": "dn/_HOST", 
-            "hive_metastore_keytab": "/etc/security/keytabs/hive.service.keytab", 
-            "keytab_path": "/etc/security/keytabs",
-            "tasktracker_principal_name": "tt/_HOST", 
-            "jobtracker_keytab": "/etc/security/keytabs/jt.service.keytab", 
-            "tasktracker_keytab": "/etc/security/keytabs/tt.service.keytab", 
-            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab", 
-            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", 
-            "kerberos_domain": "EXAMPLE.COM", 
-            "snamenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "oozie_principal_name": "oozie/c6402.ambari.apache.org", 
-            "hive_metastore_principal_name": "hive/_HOST", 
-            "datanode_keytab": "/etc/security/keytabs/dn.service.keytab", 
-            "oozie_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "hadoop_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "oozie_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM", 
-            "webhcat_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab", 
-            "hbase_master_principal_name": "hbase/_HOST", 
-            "hbase_regionserver_principal_name": "hbase/_HOST", 
-            "webHCat_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "snamenode_principal_name": "nn/_HOST", 
-            "hbase_regionserver_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "hbase_principal_name": "hbase", 
-            "hdfs_principal_name": "hdfs"
+            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab",
+            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab"
         }, 
         "hbase-env": {
             "hbase_pid_dir": "/var/run/hbase", 
@@ -584,7 +554,8 @@
             "hbase_master_heapsize": "1024m", 
             "content": "\n# Set environment variables here.\n\n# The java implementation to use. Java 1.6 required.\nexport JAVA_HOME={{java64_home}}\n\n# HBase Configuration directory\nexport HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}\n\n# Extra Java CLASSPATH elements. Optional.\nexport HBASE_CLASSPATH=${HBASE_CLASSPATH}\n\n# The maximum amount of heap to use, in MB. Default is 1000.\n# export HBASE_HEAPSIZE=1000\n\n# Extra Java runtime options.\n# Below are what we set by default. May only work with SUN JVM.\n# For more on why as well as other possible settings,\n# see http://wiki.apache.org/hadoop/PerformanceTuning\nexport HBASE_OPTS=\"-XX:+UseConcMarkSweepGC -XX:ErrorFile={{log_dir}}/hs_err_pid%p.log\"\nexport SERVER_GC_OPTS=\"-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:{{log_dir}}/gc.log-`date +'%Y%m%d%H%M'`\"\n# Uncomment below to enable java garbage collection logging.\n# export HBASE_OPTS=\"$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintG
 CDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log\"\n\n# Uncomment and adjust to enable JMX exporting\n# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access.\n# More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html\n#\n# export HBASE_JMX_BASE=\"-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false\"\nexport HBASE_MASTER_OPTS=\"-Xmx{{master_heapsize}}\"\nexport HBASE_REGIONSERVER_OPTS=\"-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70  -Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}\"\n# export HBASE_THRIFT_OPTS=\"$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103\"\n# export HBASE_ZOOKEEPER_OPTS=\"$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104\"\n\n# File naming hosts on which HRegionServers will run. $HBASE_HOME/conf/regionservers by default.\nexport HBASE_REGIONSERVERS=${HBASE_CONF_DIR}/regionservers\n\n# 
 Extra ssh options. Empty by default.\n# export HBASE_SSH_OPTS=\"-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR\"\n\n# Where log files are stored. $HBASE_HOME/logs by default.\nexport HBASE_LOG_DIR={{log_dir}}\n\n# A string representing this instance of hbase. $USER by default.\n# export HBASE_IDENT_STRING=$USER\n\n# The scheduling priority for daemon processes. See 'man nice'.\n# export HBASE_NICENESS=10\n\n# The directory where pid files are stored. /tmp by default.\nexport HBASE_PID_DIR={{pid_dir}}\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 HBASE_SLAVE_SLEEP=0.1\n\n# Tell HBase whether it should manage it's own instance of Zookeeper or not.\nexport HBASE_MANAGES_ZK=false\n\n{% if security_enabled %}\nexport HBASE_OPTS=\"$HBASE_OPTS -Djava.security.auth.login.config={{client_jaas_config_file}}\"\nexport HBASE_MASTER_OPTS=\
 "$HBASE_MASTER_OPTS -Djava.security.auth.login.config={{master_jaas_config_file}}\"\nexport HBASE_REGIONSERVER_OPTS=\"$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config={{regionserver_jaas_config_file}}\"\n{% endif %}\n    ", 
             "hbase_regionserver_heapsize": "1024m", 
-            "hbase_log_dir": "/var/log/hbase"
+            "hbase_log_dir": "/var/log/hbase",
+            "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab"
         }, 
         "ganglia-env": {
             "gmond_user": "nobody", 
@@ -606,7 +577,9 @@
             "initLimit": "10", 
             "zk_pid_dir": "/var/run/zookeeper", 
             "zk_data_dir": "/hadoop/zookeeper", 
-            "tickTime": "2000"
+            "tickTime": "2000",
+            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM",
+            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab"
         }, 
         "hdfs-log4j": {
             "content": "log4jproperties\nline2"

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 381ae3b..353bfe5 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -482,52 +482,8 @@
             "smokeuser": "ambari-qa", 
             "hadoop_heapsize": "1024", 
             "hadoop_pid_dir_prefix": "/var/run/hadoop",
-			"jobhistory_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "resourcemanager_principal_name": "rm/_HOST", 
-            "hadoop_http_principal_name": "HTTP/_HOST", 
-            "kinit_path_local": "/usr/bin",
-            "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab", 
-            "namenode_principal_name": "nn/_HOST", 
-            "namenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",  
-            "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab", 
-            "journalnode_keytab": "/etc/security/keytabs/jn.service.keytab", 
-            "hbase_master_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "datanode_principal_name": "dn/_HOST", 
-            "hive_metastore_keytab": "/etc/security/keytabs/hive.service.keytab", 
-            "jobhistory_keytab": "/etc/security/keytabs/jhs.service.keytab",
-            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab", 
-            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", 
-            "kerberos_domain": "EXAMPLE.COM", 
-            "snamenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "oozie_principal_name": "oozie/c6402.ambari.apache.org", 
-            "hive_metastore_principal_name": "hive/_HOST", 
-            "datanode_keytab": "/etc/security/keytabs/dn.service.keytab", 
-            "oozie_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "oozie_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "nodemanager_keytab": "/etc/security/keytabs/nm.service.keytab", 
-            "journalnode_principal_name": "jn/_HOST", 
-            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM", 
-            "nodemanager_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "webhcat_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab", 
-            "hbase_master_principal_name": "hbase/_HOST", 
-            "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab", 
-            "keytab_path": "/etc/security/keytabs", 
-            "resourcemanager_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hbase_regionserver_principal_name": "hbase/_HOST", 
-            "hadoop_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "jobhistory_principal_name": "jhs/_HOST", 
-            "webHCat_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "jobhistory_http_principal_name": "HTTP/_HOST", 
-            "resourcemanager_keytab": "/etc/security/keytabs/rm.service.keytab", 
-            "snamenode_principal_name": "nn/_HOST", 
-            "nodemanager_principal_name": "nm/_HOST", 
-            "nodemanager_http_principal_name": "HTTP/_HOST", 
-            "resourcemanager_http_principal_name": "HTTP/_HOST", 
-            "hbase_regionserver_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "hbase_principal_name": "hbase", 
-            "hdfs_principal_name": "hdfs"
+            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab",
+            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab"
         },
         "hive-env": {
             "hcat_pid_dir": "/var/run/webhcat", 
@@ -551,7 +507,8 @@
             "hbase_master_heapsize": "1024m", 
             "content": "\n# Set environment variables here.\n\n# The java implementation to use. Java 1.6 required.\nexport JAVA_HOME={{java64_home}}\n\n# HBase Configuration directory\nexport HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}\n\n# Extra Java CLASSPATH elements. Optional.\nexport HBASE_CLASSPATH=${HBASE_CLASSPATH}\n\n# The maximum amount of heap to use, in MB. Default is 1000.\n# export HBASE_HEAPSIZE=1000\n\n# Extra Java runtime options.\n# Below are what we set by default. May only work with SUN JVM.\n# For more on why as well as other possible settings,\n# see http://wiki.apache.org/hadoop/PerformanceTuning\nexport HBASE_OPTS=\"-XX:+UseConcMarkSweepGC -XX:ErrorFile={{log_dir}}/hs_err_pid%p.log\"\nexport SERVER_GC_OPTS=\"-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:{{log_dir}}/gc.log-`date +'%Y%m%d%H%M'`\"\n# Uncomment below to enable java garbage collection logging.\n# export HBASE_OPTS=\"$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintG
 CDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log\"\n\n# Uncomment and adjust to enable JMX exporting\n# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access.\n# More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html\n#\n# export HBASE_JMX_BASE=\"-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false\"\nexport HBASE_MASTER_OPTS=\"-Xmx{{master_heapsize}}\"\nexport HBASE_REGIONSERVER_OPTS=\"-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70  -Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}\"\n# export HBASE_THRIFT_OPTS=\"$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103\"\n# export HBASE_ZOOKEEPER_OPTS=\"$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104\"\n\n# File naming hosts on which HRegionServers will run. $HBASE_HOME/conf/regionservers by default.\nexport HBASE_REGIONSERVERS=${HBASE_CONF_DIR}/regionservers\n\n# 
 Extra ssh options. Empty by default.\n# export HBASE_SSH_OPTS=\"-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR\"\n\n# Where log files are stored. $HBASE_HOME/logs by default.\nexport HBASE_LOG_DIR={{log_dir}}\n\n# A string representing this instance of hbase. $USER by default.\n# export HBASE_IDENT_STRING=$USER\n\n# The scheduling priority for daemon processes. See 'man nice'.\n# export HBASE_NICENESS=10\n\n# The directory where pid files are stored. /tmp by default.\nexport HBASE_PID_DIR={{pid_dir}}\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 HBASE_SLAVE_SLEEP=0.1\n\n# Tell HBase whether it should manage it's own instance of Zookeeper or not.\nexport HBASE_MANAGES_ZK=false\n\n{% if security_enabled %}\nexport HBASE_OPTS=\"$HBASE_OPTS -Djava.security.auth.login.config={{client_jaas_config_file}}\"\nexport HBASE_MASTER_OPTS=\
 "$HBASE_MASTER_OPTS -Djava.security.auth.login.config={{master_jaas_config_file}}\"\nexport HBASE_REGIONSERVER_OPTS=\"$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config={{regionserver_jaas_config_file}}\"\n{% endif %}", 
             "hbase_regionserver_heapsize": "1024m", 
-            "hbase_log_dir": "/var/log/hbase"
+            "hbase_log_dir": "/var/log/hbase",
+            "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab"
         },
         "ganglia-env": {
             "gmond_user": "nobody", 
@@ -572,7 +529,9 @@
             "initLimit": "10", 
             "zk_pid_dir": "/var/run/zookeeper", 
             "zk_data_dir": "/hadoop/zookeeper", 
-            "tickTime": "2000"
+            "tickTime": "2000",
+            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM",
+            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab"
         },
         "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.", 
@@ -587,30 +546,10 @@
             "nagios_user": "nagios", 
             "nagios_group": "nagios", 
             "nagios_web_login": "nagiosadmin", 
-            "nagios_contact": "user@com.ua"
-        }, 
-        "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"
-        }, 
-        "storm-env": {
-            "content": "\n#!/bin/bash\n\n# Set Storm specific environment variables here.\n\n# The java implementation to use.\nexport JAVA_HOME={{java_home}}\n\n# export STORM_CONF_DIR=\"\"", 
-            "storm_log_dir": "/var/log/storm", 
-            "storm_pid_dir": "/var/run/storm", 
-            "storm_user": "storm"
-        }, 
-        "falcon-env": {
-            "falcon_port": "15000", 
-            "falcon_pid_dir": "/var/run/falcon", 
-            "falcon_log_dir": "/var/log/falcon", 
-            "falcon.emeddedmq.port": "61616", 
-            "falcon_user": "falcon", 
-            "falcon_local_dir": "/hadoop/falcon", 
-            "content": "\n# The java implementation to use. If JAVA_HOME is not found we expect java and jar to be in path\nexport JAVA_HOME={{java_home}}\n\n# any additional java opts you want to set. This will apply to both client and server operations\n#export FALCON_OPTS=\n\n# any additional java opts that you want to set for client only\n#export FALCON_CLIENT_OPTS=\n\n# java heap size we want to set for the client. Default is 1024MB\n#export FALCON_CLIENT_HEAP=\n\n# any additional opts you want to set for prisim service.\n#export FALCON_PRISM_OPTS=\n\n# java heap size we want to set for the prisim service. Default is 1024MB\n#export FALCON_PRISM_HEAP=\n\n# any additional opts you want to set for falcon service.\nexport FALCON_SERVER_OPTS=\"-Dfalcon.embeddedmq={{falcon_embeddedmq_enabled}} -Dfalcon.emeddedmq.port={{falcon_emeddedmq_port}}\"\n\n# java heap size we want to set for the falcon server. Default is 1024MB\n#export FALCON_SERVER_HEAP=\n\n# What is is considered as falco
 n home dir. Default is the base locaion of the installed software\n#export FALCON_HOME_DIR=\n\n# Where log files are stored. Defatult is logs directory under the base install location\nexport FALCON_LOG_DIR={{falcon_log_dir}}\n\n# Where pid files are stored. Defatult is logs directory under the base install location\nexport FALCON_PID_DIR={{falcon_pid_dir}}\n\n# where the falcon active mq data is stored. Defatult is logs/data directory under the base install location\nexport FALCON_DATA_DIR={{falcon_embeddedmq_data}}\n\n# Where do you want to expand the war file. By Default it is in /server/webapp dir under the base install dir.\n#export FALCON_EXPANDED_WEBAPP_DIR=", 
-            "falcon.embeddedmq.data": "/hadoop/falcon/embeddedmq/data", 
-            "falcon.embeddedmq": "true", 
-            "falcon_store_uri": "file:///hadoop/falcon/store"
-        }, 
+            "nagios_contact": "user@com.ua",
+            "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
+            "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab"
+        },
         "oozie-env": {
             "oozie_derby_database": "Derby", 
             "oozie_admin_port": "11001", 
@@ -620,7 +559,8 @@
             "oozie_user": "oozie", 
             "oozie_database": "New Derby Database", 
             "oozie_data_dir": "/hadoop/oozie/data", 
-            "oozie_log_dir": "/var/log/oozie"
+            "oozie_log_dir": "/var/log/oozie",
+            "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab"
         }, 
         "webhcat-env": {
             "content": "\n# The file containing the running pid\nPID_FILE={{pid_file}}\n\nTEMPLETON_LOG_DIR={{templeton_log_dir}}/\n\n\nWEBHCAT_LOG_DIR={{templeton_log_dir}}/\n\n# The console error log\nERROR_LOG={{templeton_log_dir}}/webhcat-console-error.log\n\n# The console log\nCONSOLE_LOG={{templeton_log_dir}}/webhcat-console.log\n\n#TEMPLETON_JAR=templeton_jar_name\n\n#HADOOP_PREFIX=hadoop_prefix\n\n#HCAT_PREFIX=hive_prefix\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=/usr/lib/hadoop"

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index df6446c..d5b6794 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -579,6 +579,14 @@
             "hbase_regionserver_heapsize": "1024m", 
             "hbase_log_dir": "/var/log/hbase"
         },
+        "nagios-env": {
+            "hive_metastore_user_passwd": "password", 
+            "nagios_web_password": "!`\"' 1",
+            "nagios_user": "nagios", 
+            "nagios_group": "nagios", 
+            "nagios_web_login": "nagiosadmin", 
+            "nagios_contact": "user@com.ua"
+        }, 
         "ganglia-env": {
             "gmond_user": "nobody", 
             "ganglia_runtime_dir": "/var/run/ganglia/hdp", 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c13dad9a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
index e2d0daa..367cd43 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
@@ -275,169 +275,6 @@
             "templeton.pig.archive": "hdfs:///apps/webhcat/pig.tar.gz",
             "templeton.hadoop.queue.name": "default"
         }, 
-        "global": {
-            "falcon_log_dir": "/var/log/falcon",
-            "falcon_pid_dir": "/var/run/falcon",
-            "jobhistory_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "syncLimit": "5", 
-            "resourcemanager_principal_name": "rm/_HOST", 
-            "hadoop_http_principal_name": "HTTP/_HOST", 
-            "kinit_path_local": "/usr/bin", 
-            "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab", 
-            "hbase_regionserver_heapsize": "1024m", 
-            "resourcemanager_http_primary_name": "HTTP", 
-            "datanode_primary_name": "dn", 
-            "namenode_principal_name": "nn/_HOST", 
-            "namenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM", 
-            "dfs_datanode_http_address": "1022", 
-            "falcon_user": "falcon", 
-            "nagios_web_login": "nagiosadmin", 
-            "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab", 
-            "yarn_heapsize": "1024", 
-            "hbase_pid_dir": "/var/run/hbase", 
-            "namenode_opt_maxnewsize": "200m", 
-            "journalnode_keytab": "/etc/security/keytabs/jn.service.keytab", 
-            "hcat_pid_dir": "/var/run/webhcat", 
-            "oozie_jdbc_driver": "org.apache.derby.jdbc.EmbeddedDriver", 
-            "hive_metastore_primary_name": "hive", 
-            "hbase_master_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "nagios_primary_name": "nagios", 
-            "hive_database": "New MySQL Database", 
-            "clientPort": "2181", 
-            "oozie_derby_database": "Derby", 
-            "mapred_log_dir_prefix": "/var/log/hadoop-mapreduce", 
-            "oozie_pid_dir": "/var/run/oozie", 
-            "datanode_principal_name": "dn/_HOST", 
-            "hive_metastore_keytab": "/etc/security/keytabs/hive.service.keytab", 
-            "nagios_group": "nagios", 
-            "hcat_user": "hcat", 
-            "hadoop_heapsize": "1024", 
-            "hbase_regionserver_primary_name": "hbase", 
-            "zk_user": "zookeeper", 
-            "rrdcached_base_dir": "/var/lib/ganglia/rrds", 
-            "jobhistory_keytab": "/etc/security/keytabs/jhs.service.keytab", 
-            "hive_pid_dir": "/var/run/hive", 
-            "webhcat_server": "c6402.ambari.apache.org", 
-            "zk_data_dir": "/hadoop/zookeeper", 
-            "hcat_log_dir": "/var/log/webhcat", 
-            "oozie_hostname": "c6402.ambari.apache.org", 
-            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab", 
-            "namenode_heapsize": "1024m", 
-            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", 
-            "kerberos_domain": "EXAMPLE.COM", 
-            "yarn_nodemanager_container-executor_class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor", 
-            "snamenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "dfs_datanode_address": "1019", 
-            "nagios_server": "c6402.ambari.apache.org", 
-            "ganglia_runtime_dir": "/var/run/ganglia/hdp", 
-            "lzo_enabled": "true", 
-            "oozie_principal_name": "oozie/c6402.ambari.apache.org", 
-            "hive_hostname": "c6402.ambari.apache.org", 
-            "mapred_pid_dir_prefix": "/var/run/hadoop-mapreduce", 
-            "namenode_opt_newsize": "200m", 
-            "yarn_pid_dir_prefix": "/var/run/hadoop-yarn", 
-            "initLimit": "10", 
-            "hive_database_type": "postgres",
-            "zk_pid_dir": "/var/run/zookeeper", 
-            "jobhistory_http_primary_name": "HTTP", 
-            "namenode_primary_name": "nn", 
-            "tickTime": "2000",
-            "storm_keytab" : "/etc/security/keytabs/storm.service.keytab",
-            "storm_principal_name": "storm",
-            "storm_user": "storm", 
-            "hive_metastore_principal_name": "hive/_HOST", 
-            "datanode_keytab": "/etc/security/keytabs/dn.service.keytab", 
-            "yarn_log_dir_prefix": "/var/log/hadoop-yarn", 
-            "journalnode_primary_name": "jn", 
-            "oozie_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "gmetad_user": "nobody", 
-            "nodemanager_http_primary_name": "HTTP", 
-            "oozie_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hive_metastore": "c6402.ambari.apache.org", 
-            "nodemanager_keytab": "/etc/security/keytabs/nm.service.keytab", 
-            "journalnode_principal_name": "jn/_HOST", 
-            "security_enabled": "true", 
-            "proxyuser_group": "users", 
-            "storm_pid_dir": "/var/run/storm", 
-            "hbase_primary_name": "hbase", 
-            "oozie_http_primary_name": "HTTP", 
-            "logviewerserver_host": "c6402.ambari.apache.org", 
-            "dtnode_heapsize": "1024m", 
-            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM", 
-            "nodemanager_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "oozie_log_dir": "/var/log/oozie", 
-            "webhcat_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab", 
-            "oozie_user": "oozie", 
-            "oozie_data_dir": "/hadoop/oozie/data", 
-            "oozie_primary_name": "oozie", 
-            "drpcserver_host": "c6402.ambari.apache.org", 
-            "hdfs_log_dir_prefix": "/var/log/hadoop", 
-            "storm_log_dir": "/var/log/storm", 
-            "zookeeper_primary_name": "zookeeper", 
-            "hbase_master_principal_name": "hbase/_HOST", 
-            "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab", 
-            "yarn_user": "yarn", 
-            "gmond_user": "nobody", 
-            "keytab_path": "/etc/security/keytabs", 
-            "nagios_contact": "asd@asd.asd", 
-            "snamenode_primary_name": "nn", 
-            "jobhistory_primary_name": "jhs", 
-            "hdfs_user": "hdfs", 
-            "oozie_database_type": "derby", 
-            "webhcat_user": "hcat", 
-            "nodemanager_heapsize": "1024", 
-            "resourcemanager_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "zk_log_dir": "/var/log/zookeeper", 
-            "hbase_regionserver_principal_name": "hbase/_HOST", 
-            "hive_log_dir": "/var/log/hive", 
-            "smokeuser_principal_name": "ambari-qa", 
-            "mapred_user": "mapred", 
-            "nodemanager_primary_name": "nm", 
-            "smokeuser_primary_name": "ambari-qa", 
-            "hadoop_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hbase_master_primary_name": "hbase", 
-            "oozie_servername": "c6402.ambari.apache.org", 
-            "stormuiserver_host": "c6401.ambari.apache.org", 
-            "hdfs_primary_name": "hdfs", 
-            "hive_aux_jars_path": "/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar", 
-            "jobhistory_principal_name": "jhs/_HOST", 
-            "hive_ambari_database": "MySQL", 
-            "rca_enabled": "false", 
-            "hcat_conf_dir": "", 
-            "resourcemanager_primary_name": "rm", 
-            "hadoop_http_primary_name": "HTTP", 
-            "webHCat_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "jobhistory_http_principal_name": "HTTP/_HOST", 
-            "hive_metastore_port": "9083", 
-            "hbase_user": "hbase", 
-            "resourcemanager_keytab": "/etc/security/keytabs/rm.service.keytab", 
-            "snamenode_principal_name": "nn/_HOST", 
-            "nodemanager_principal_name": "nm/_HOST", 
-            "oozie_database": "New Derby Database", 
-            "hbase_log_dir": "/var/log/hbase", 
-            "user_group": "hadoop", 
-            "nodemanager_http_principal_name": "HTTP/_HOST", 
-            "hive_user": "hive", 
-            "resourcemanager_http_principal_name": "HTTP/_HOST", 
-            "webHCat_http_primary_name": "HTTP", 
-            "nagios_web_password": "asd", 
-            "smokeuser": "ambari-qa", 
-            "hbase_master_heapsize": "1024m", 
-            "kerberos_install_type": "MANUALLY_SET_KERBEROS", 
-            "hadoop_pid_dir_prefix": "/var/run/hadoop", 
-            "nagios_user": "nagios", 
-            "resourcemanager_heapsize": "1024", 
-            "hbase_regionserver_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "hbase_principal_name": "hbase", 
-            "hdfs_principal_name": "hdfs",
-            "falcon_user": "falcon",
-            "falcon_port": "15000",
-            "falcon_local_dir": "/hadoop/falcon",
-            "tez_user": "tez",
-            "rca_enabled": "false"
-        }, 
         "capacity-scheduler": {
             "yarn.scheduler.capacity.node-locality-delay": "40", 
             "yarn.scheduler.capacity.root.capacity": "100", 
@@ -688,53 +525,8 @@
             "smokeuser": "ambari-qa", 
             "hadoop_heapsize": "1024", 
             "hadoop_pid_dir_prefix": "/var/run/hadoop",
-            "jobhistory_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "resourcemanager_principal_name": "rm/_HOST", 
-            "hadoop_http_principal_name": "HTTP/_HOST", 
-            "kinit_path_local": "/usr/bin",
-            "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab", 
-            "namenode_principal_name": "nn/_HOST", 
-            "namenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",  
-            "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab", 
-            "journalnode_keytab": "/etc/security/keytabs/jn.service.keytab", 
-            "hbase_master_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "datanode_principal_name": "dn/_HOST", 
-            "hive_metastore_keytab": "/etc/security/keytabs/hive.service.keytab", 
-            "jobhistory_keytab": "/etc/security/keytabs/jhs.service.keytab",
-            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab", 
-            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", 
-            "kerberos_domain": "EXAMPLE.COM", 
-            "snamenode_keytab": "/etc/security/keytabs/nn.service.keytab", 
-            "oozie_principal_name": "oozie/c6402.ambari.apache.org", 
-            "hive_metastore_principal_name": "hive/_HOST", 
-            "datanode_keytab": "/etc/security/keytabs/dn.service.keytab", 
-            "oozie_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "oozie_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "nodemanager_keytab": "/etc/security/keytabs/nm.service.keytab", 
-            "journalnode_principal_name": "jn/_HOST", 
-            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM", 
-            "nodemanager_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "webhcat_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab", 
-            "hbase_master_principal_name": "hbase/_HOST", 
-            "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab", 
-            "keytab_path": "/etc/security/keytabs", 
-            "resourcemanager_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "hbase_regionserver_principal_name": "hbase/_HOST", 
-            "hadoop_http_keytab": "/etc/security/keytabs/spnego.service.keytab", 
-            "jobhistory_principal_name": "jhs/_HOST", 
-            "webHCat_http_principal_name": "HTTP/c6402.ambari.apache.org", 
-            "jobhistory_http_principal_name": "HTTP/_HOST", 
-            "resourcemanager_keytab": "/etc/security/keytabs/rm.service.keytab", 
-            "snamenode_principal_name": "nn/_HOST", 
-            "nodemanager_principal_name": "nm/_HOST", 
-            "nodemanager_http_principal_name": "HTTP/_HOST", 
-            "resourcemanager_http_principal_name": "HTTP/_HOST", 
-            "hbase_regionserver_keytab": "/etc/security/keytabs/hbase.service.keytab", 
-            "hbase_principal_name": "hbase", 
-            "hdfs_principal_name": "hdfs",
-            "storm_principal_name": "storm/_HOST@EXAMPLE.COM"
+            "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab",
+            "hdfs_user_keytab": "/etc/security/keytabs/hdfs.headless.keytab"
         },
         "hive-env": {
             "hcat_pid_dir": "/var/run/webhcat", 
@@ -758,8 +550,19 @@
             "hbase_master_heapsize": "1024m", 
             "content": "\n# Set environment variables here.\n\n# The java implementation to use. Java 1.6 required.\nexport JAVA_HOME={{java64_home}}\n\n# HBase Configuration directory\nexport HBASE_CONF_DIR=${HBASE_CONF_DIR:-{{hbase_conf_dir}}}\n\n# Extra Java CLASSPATH elements. Optional.\nexport HBASE_CLASSPATH=${HBASE_CLASSPATH}\n\n# The maximum amount of heap to use, in MB. Default is 1000.\n# export HBASE_HEAPSIZE=1000\n\n# Extra Java runtime options.\n# Below are what we set by default. May only work with SUN JVM.\n# For more on why as well as other possible settings,\n# see http://wiki.apache.org/hadoop/PerformanceTuning\nexport HBASE_OPTS=\"-XX:+UseConcMarkSweepGC -XX:ErrorFile={{log_dir}}/hs_err_pid%p.log\"\nexport SERVER_GC_OPTS=\"-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:{{log_dir}}/gc.log-`date +'%Y%m%d%H%M'`\"\n# Uncomment below to enable java garbage collection logging.\n# export HBASE_OPTS=\"$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintG
 CDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log\"\n\n# Uncomment and adjust to enable JMX exporting\n# See jmxremote.password and jmxremote.access in $JRE_HOME/lib/management to configure remote password access.\n# More details at: http://java.sun.com/javase/6/docs/technotes/guides/management/agent.html\n#\n# export HBASE_JMX_BASE=\"-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false\"\nexport HBASE_MASTER_OPTS=\"-Xmx{{master_heapsize}}\"\nexport HBASE_REGIONSERVER_OPTS=\"-Xmn{{regionserver_xmn_size}} -XX:CMSInitiatingOccupancyFraction=70  -Xms{{regionserver_heapsize}} -Xmx{{regionserver_heapsize}}\"\n# export HBASE_THRIFT_OPTS=\"$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103\"\n# export HBASE_ZOOKEEPER_OPTS=\"$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104\"\n\n# File naming hosts on which HRegionServers will run. $HBASE_HOME/conf/regionservers by default.\nexport HBASE_REGIONSERVERS=${HBASE_CONF_DIR}/regionservers\n\n# 
 Extra ssh options. Empty by default.\n# export HBASE_SSH_OPTS=\"-o ConnectTimeout=1 -o SendEnv=HBASE_CONF_DIR\"\n\n# Where log files are stored. $HBASE_HOME/logs by default.\nexport HBASE_LOG_DIR={{log_dir}}\n\n# A string representing this instance of hbase. $USER by default.\n# export HBASE_IDENT_STRING=$USER\n\n# The scheduling priority for daemon processes. See 'man nice'.\n# export HBASE_NICENESS=10\n\n# The directory where pid files are stored. /tmp by default.\nexport HBASE_PID_DIR={{pid_dir}}\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 HBASE_SLAVE_SLEEP=0.1\n\n# Tell HBase whether it should manage it's own instance of Zookeeper or not.\nexport HBASE_MANAGES_ZK=false\n\n{% if security_enabled %}\nexport HBASE_OPTS=\"$HBASE_OPTS -Djava.security.auth.login.config={{client_jaas_config_file}}\"\nexport HBASE_MASTER_OPTS=\
 "$HBASE_MASTER_OPTS -Djava.security.auth.login.config={{master_jaas_config_file}}\"\nexport HBASE_REGIONSERVER_OPTS=\"$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config={{regionserver_jaas_config_file}}\"\n{% endif %}", 
             "hbase_regionserver_heapsize": "1024m", 
-            "hbase_log_dir": "/var/log/hbase"
+            "hbase_log_dir": "/var/log/hbase",
+            "hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab"
         },
+        "nagios-env": {
+            "hive_metastore_user_passwd": "password", 
+            "nagios_web_password": "!`\"' 1",
+            "nagios_user": "nagios", 
+            "nagios_group": "nagios", 
+            "nagios_web_login": "nagiosadmin", 
+            "nagios_contact": "user@com.ua",
+            "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
+            "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab"
+        }, 
         "ganglia-env": {
             "gmond_user": "nobody", 
             "ganglia_runtime_dir": "/var/run/ganglia/hdp", 
@@ -779,7 +582,9 @@
             "initLimit": "10", 
             "zk_pid_dir": "/var/run/zookeeper", 
             "zk_data_dir": "/hadoop/zookeeper", 
-            "tickTime": "2000"
+            "tickTime": "2000",
+            "zookeeper_principal_name": "zookeeper/_HOST@EXAMPLE.COM",
+            "zookeeper_keytab_path": "/etc/security/keytabs/zk.service.keytab"
         },
         "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.", 
@@ -796,7 +601,8 @@
             "content": "\n#!/bin/bash\n\n# Set Storm specific environment variables here.\n\n# The java implementation to use.\nexport JAVA_HOME={{java_home}}\n\n# export STORM_CONF_DIR=\"\"", 
             "storm_log_dir": "/var/log/storm", 
             "storm_pid_dir": "/var/run/storm", 
-            "storm_user": "storm"
+            "storm_user": "storm",
+            "storm_principal_name": "storm"
         }, 
         "falcon-env": {
             "falcon_port": "15000", 
@@ -819,7 +625,8 @@
             "oozie_user": "oozie", 
             "oozie_database": "New Derby Database", 
             "oozie_data_dir": "/hadoop/oozie/data", 
-            "oozie_log_dir": "/var/log/oozie"
+            "oozie_log_dir": "/var/log/oozie",
+            "oozie_keytab": "/etc/security/keytabs/oozie.service.keytab"
         }, 
         "webhcat-env": {
             "content": "\n# The file containing the running pid\nPID_FILE={{pid_file}}\n\nTEMPLETON_LOG_DIR={{templeton_log_dir}}/\n\n\nWEBHCAT_LOG_DIR={{templeton_log_dir}}/\n\n# The console error log\nERROR_LOG={{templeton_log_dir}}/webhcat-console-error.log\n\n# The console log\nCONSOLE_LOG={{templeton_log_dir}}/webhcat-console.log\n\n#TEMPLETON_JAR=templeton_jar_name\n\n#HADOOP_PREFIX=hadoop_prefix\n\n#HCAT_PREFIX=hive_prefix\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=/usr/lib/hadoop"
@@ -988,4 +795,4 @@
             "c6402.ambari.apache.org"
         ]
     }
-}
+}
\ No newline at end of file


Mime
View raw message