You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rn...@apache.org on 2015/02/12 19:08:16 UTC

ambari git commit: AMBARI-9584. Blueprint deployments fail with 500 server error (NullPointerException). (rnettleton, dsen via rnettleton)

Repository: ambari
Updated Branches:
  refs/heads/trunk df26a7026 -> b8fa0fc49


AMBARI-9584. Blueprint deployments fail with 500 server error (NullPointerException).  (rnettleton, dsen via rnettleton)


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

Branch: refs/heads/trunk
Commit: b8fa0fc4909aaea2b0b8cbb8abc5c7f0155a2ce9
Parents: df26a70
Author: Bob Nettleton <rn...@hortonworks.com>
Authored: Thu Feb 12 13:06:42 2015 -0500
Committer: Bob Nettleton <rn...@hortonworks.com>
Committed: Thu Feb 12 13:08:02 2015 -0500

----------------------------------------------------------------------
 .../configuration/ams-hbase-security-site.xml   |  18 +++
 ambari-web/app/data/HDP2/site_properties.js     | 162 +++++++++++++++++++
 2 files changed, 180 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b8fa0fc4/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
index 35d395f..6f60736 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
@@ -22,56 +22,74 @@
 <configuration>
   <property>
     <name>ams.zookeeper.keytab</name>
+    <value></value>
   </property>
   <property>
     <name>ams.zookeeper.principal</name>
+    <value></value>
   </property>
   <property>
     <name>hadoop.security.authentication</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.coprocessor.master.classes</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.coprocessor.region.classes</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.master.kerberos.principal</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.master.keytab.file</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.myclient.keytab</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.myclient.principal</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.regionserver.kerberos.principal</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.regionserver.keytab.file</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.security.authentication</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.security.authorization</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.zookeeper.property.authProvider.1</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.zookeeper.property.jaasLoginRenew</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.zookeeper.property.kerberos.removeHostFromPrincipal</name>
+    <value></value>
   </property>
   <property>
     <name>hbase.zookeeper.property.kerberos.removeRealmFromPrincipal</name>
+    <value></value>
   </property>
   <property>
     <name>zookeeper.znode.parent</name>
+    <value></value>
   </property>
 </configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/b8fa0fc4/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index d73d131..0f25cb5 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -4445,6 +4445,168 @@ var hdp2properties = [
     "category": "MetricCollector",
     "index": 3
   },
+  {
+    "id": "site property",
+    "name": "ams.zookeeper.keytab",
+    "displayName": "ams.zookeeper.keytab",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "ams.zookeeper.principal",
+    "displayName": "ams.zookeeper.principal",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hadoop.security.authentication",
+    "displayName": "hadoop.security.authentication",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.coprocessor.master.classes",
+    "displayName": "hbase.coprocessor.master.classes",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.coprocessor.region.classes",
+    "displayName": "hbase.coprocessor.region.classes",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.master.kerberos.principal",
+    "displayName": "hbase.master.kerberos.principal",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.master.keytab.file",
+    "displayName": "hbase.master.keytab.file",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.myclient.keytab",
+    "displayName": "hbase.myclient.keytab",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.myclient.principal",
+    "displayName": "hbase.myclient.principal",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.regionserver.kerberos.principal",
+    "displayName": "hbase.regionserver.kerberos.principal",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.regionserver.keytab.file",
+    "displayName": "hbase.regionserver.keytab.file",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.security.authentication",
+    "displayName": "hbase.security.authentication",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.security.authorization",
+    "displayName": "hbase.security.authorization",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.zookeeper.property.authProvider.1",
+    "displayName": "hbase.zookeeper.property.authProvider.1",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.zookeeper.property.jaasLoginRenew",
+    "displayName": "hbase.zookeeper.property.jaasLoginRenew",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.zookeeper.property.kerberos.removeHostFromPrincipal",
+    "displayName": "hbase.zookeeper.property.kerberos.removeHostFromPrincipal",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "hbase.zookeeper.property.kerberos.removeRealmFromPrincipal",
+    "displayName": "hbase.zookeeper.property.kerberos.removeRealmFromPrincipal",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
+  {
+    "id": "site property",
+    "name": "zookeeper.znode.parent",
+    "displayName": "zookeeper.znode.parent",
+    "isRequired": false,
+    "serviceName": "AMBARI_METRICS",
+    "category": "Advanced ams-hbase-security-site",
+    "filename": "ams-hbase-security-site.xml"
+  },
 /************************************************Kerberos Descriptor******************************************/
   {
     "name": "smokeuser_principal_name",