You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2015/05/27 14:52:26 UTC
ambari git commit: AMBARI-11420. Property enhancements and other
fixes for Ranger KMS (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk fd66b4120 -> 47f26687d
AMBARI-11420. Property enhancements and other fixes for Ranger KMS (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47f26687
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47f26687
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47f26687
Branch: refs/heads/trunk
Commit: 47f26687d186fd05699f19687dae4027509f4a24
Parents: fd66b41
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed May 27 15:51:45 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed May 27 15:51:45 2015 +0300
----------------------------------------------------------------------
.../0.5.0.2.3/configuration/kms-properties.xml | 14 ++++++++++----
.../common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml | 10 +++++++---
ambari-web/app/data/HDP2.3/site_properties.js | 12 ++++--------
3 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/47f26687/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
index 361e52d..6c37b94 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-properties.xml
@@ -40,6 +40,12 @@
</property>
<property>
+ <name>SQL_CONNECTOR_JAR</name>
+ <value>/usr/share/java/mysql-connector-java.jar</value>
+ <description>Location of DB client library (please check the location of the jar file)</description>
+ </property>
+
+ <property>
<name>db_root_user</name>
<value>root</value>
<description></description>
@@ -47,7 +53,7 @@
<property>
<name>db_root_password</name>
- <value>vagrant</value>
+ <value></value>
<property-type>PASSWORD</property-type>
<description></description>
</property>
@@ -72,16 +78,16 @@
<property>
<name>db_password</name>
- <value>rangerkms</value>
+ <value></value>
<property-type>PASSWORD</property-type>
<description></description>
</property>
<property>
<name>KMS_MASTER_KEY_PASSWD</name>
- <value>Str0ngPassw0rd</value>
+ <value></value>
<property-type>PASSWORD</property-type>
<description></description>
</property>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/47f26687/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
index 7867c9b..a0856da 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/metainfo.xml
@@ -63,10 +63,14 @@
</osSpecifics>
<configuration-dependencies>
- <config-type>kms-properties</config-type>
- <config-type>kms-acls</config-type>
+ <config-type>kms-properties</config-type>
<config-type>kms-site</config-type>
- <config-type>kms-log4j</config-type>
+ <config-type>kms-log4j</config-type>
+ <config-type>dbks-site</config-type>
+ <config-type>ranger-kms-site</config-type>
+ <config-type>ranger-kms-audit</config-type>
+ <config-type>ranger-kms-policymgr-ssl</config-type>
+ <config-type>ranger-kms-security</config-type>
</configuration-dependencies>
<commandScript>
http://git-wip-us.apache.org/repos/asf/ambari/blob/47f26687/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 96b73a4..c82f847 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -204,8 +204,7 @@ hdp23properties.push({
"id": "site property",
"name": "xasecure.audit.destination.db",
"displayName": "Audit to DB",
- "defaultValue": "",
- "isRequired": false,
+ "displayType": "checkbox",
"filename": "ranger-kms-audit.xml",
"category": "Advanced ranger-kms-audit",
"serviceName": "RANGER_KMS"
@@ -214,8 +213,7 @@ hdp23properties.push({
"id": "site property",
"name": "xasecure.audit.destination.hdfs",
"displayName": "Audit to HDFS",
- "defaultValue": "",
- "isRequired": false,
+ "displayType": "checkbox",
"filename": "ranger-kms-audit.xml",
"category": "Advanced ranger-kms-audit",
"serviceName": "RANGER_KMS"
@@ -224,8 +222,7 @@ hdp23properties.push({
"id": "site property",
"name": "xasecure.audit.destination.solr",
"displayName": "Audit to SOLR",
- "defaultValue": "",
- "isRequired": false,
+ "displayType": "checkbox",
"filename": "ranger-kms-audit.xml",
"category": "Advanced ranger-kms-audit",
"serviceName": "RANGER_KMS"
@@ -234,8 +231,7 @@ hdp23properties.push({
"id": "site property",
"name": "xasecure.audit.provider.summary.enabled",
"displayName": "Audit provider summary enabled",
- "defaultValue": "",
- "isRequired": false,
+ "displayType": "checkbox",
"filename": "ranger-kms-audit.xml",
"category": "Advanced ranger-kms-audit",
"serviceName": "RANGER_KMS"