You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/06/05 14:19:07 UTC

ambari git commit: AMBARI-11685. AMBARI-11685 : YARN repo in Ranger Admin neds to have the right value for YARN REST URL (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk 7d793c2b3 -> 615c2d698


AMBARI-11685. AMBARI-11685 : YARN repo in Ranger Admin neds to have the right value for YARN REST URL (aonishuk)


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

Branch: refs/heads/trunk
Commit: 615c2d6984b5283250a2a2e09fc459c8aea2d93c
Parents: 7d793c2
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Jun 5 15:18:58 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Jun 5 15:18:58 2015 +0300

----------------------------------------------------------------------
 .../configuration/ranger-kms-audit.xml          |  6 ++---
 .../2.1.0.2.0/package/scripts/params_linux.py   |  7 ++++-
 .../ranger-hdfs-plugin-properties.xml           |  2 +-
 .../HBASE/configuration/ranger-hbase-audit.xml  |  1 +
 .../ranger-hbase-policymgr-ssl.xml              |  2 ++
 .../HDFS/configuration/ranger-hdfs-audit.xml    |  1 +
 .../configuration/ranger-hdfs-policymgr-ssl.xml |  2 ++
 .../HIVE/configuration/ranger-hive-audit.xml    |  1 +
 .../configuration/ranger-hive-policymgr-ssl.xml |  2 ++
 .../KAFKA/configuration/ranger-kafka-audit.xml  |  1 +
 .../ranger-kafka-plugin-properties.xml          |  4 +--
 .../ranger-kafka-policymgr-ssl.xml              |  2 ++
 .../KNOX/configuration/ranger-knox-audit.xml    |  1 +
 .../configuration/ranger-knox-policymgr-ssl.xml |  2 ++
 .../RANGER/configuration/ranger-admin-site.xml  |  8 +++---
 .../STORM/configuration/ranger-storm-audit.xml  |  1 +
 .../ranger-storm-policymgr-ssl.xml              |  2 ++
 .../YARN/configuration/ranger-yarn-audit.xml    |  1 +
 .../ranger-yarn-plugin-properties.xml           |  2 +-
 .../configuration/ranger-yarn-policymgr-ssl.xml |  2 ++
 ambari-web/app/data/HDP2.2/site_properties.js   |  9 +++++++
 ambari-web/app/data/HDP2.3/site_properties.js   | 27 ++++++++++++++++++++
 22 files changed, 75 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
index 661f818..e5bd75e 100644
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/ranger-kms-audit.xml
@@ -64,7 +64,7 @@
 
   <property>
     <name>xasecure.audit.destination.db.batch.filespool.dir</name>
-    <value>/var/log/kms/audit/db/spool</value>
+    <value>/var/log/ranger/kms/audit/db/spool</value>
     <description></description>
   </property>
 
@@ -82,7 +82,7 @@
 
   <property>
     <name>xasecure.audit.destination.hdfs.batch.filespool.dir</name>
-    <value>/var/log/kms/audit/hdfs/spool</value>
+    <value>/var/log/ranger/kms/audit/hdfs/spool</value>
     <description></description>
   </property>
 
@@ -106,7 +106,7 @@
 
   <property>
     <name>xasecure.audit.destination.solr.batch.filespool.dir</name>
-    <value>/var/log/kms/audit/solr/spool</value>
+    <value>/var/log/ranger/kms/audit/solr/spool</value>
     <description></description>
   </property>  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index f2ccaf3..35cfef4 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -298,11 +298,16 @@ if has_ranger_admin:
     ranger_env = config['configurations']['ranger-env']
     ranger_plugin_properties = config['configurations']['ranger-yarn-plugin-properties']
     policy_user = config['configurations']['ranger-yarn-plugin-properties']['policy_user']
+    yarn_rest_url = config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address']
+    yarn_http_policy = config['configurations']['yarn-site']['yarn.http.policy']
+    scheme = 'http'
+    if yarn_http_policy.upper() == 'HTTPS_ONLY':
+      scheme = 'https'    
 
     ranger_plugin_config = {
       'username' : config['configurations']['ranger-yarn-plugin-properties']['REPOSITORY_CONFIG_USERNAME'],
       'password' : unicode(config['configurations']['ranger-yarn-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']),
-      'yarn.url' : config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'],
+      'yarn.url' : format('{scheme}://{yarn_rest_url}'),
       'commonNameForCertificate' : config['configurations']['ranger-yarn-plugin-properties']['common.name.for.certificate']
     }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
index ddd90e3..32f7c54 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/ranger-hdfs-plugin-properties.xml
@@ -21,7 +21,7 @@
 
 	<property>
 		<name>hadoop.rpc.protection</name>
-		<value>-</value>
+		<value></value>
 		<description>Used for repository creation on ranger admin
 		</description>
 	</property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
index d064065..070b637 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
@@ -47,6 +47,7 @@
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
index 1254902..20b5e7d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
@@ -29,6 +29,7 @@
 	<property>
 		<name>xasecure.policymgr.clientssl.keystore.password</name>
 		<value>myKeyFilePassword</value>
+		<property-type>PASSWORD</property-type>
 		<description>password for keystore</description>
 	</property>
 
@@ -41,6 +42,7 @@
 	<property>
 		<name>xasecure.policymgr.clientssl.truststore.password</name>
 		<value>changeit</value>
+		<property-type>PASSWORD</property-type>
 		<description>java  truststore password</description>
 	</property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
index 8f8de30..57329e3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
@@ -47,6 +47,7 @@
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
index 5c8d400..8f48fcf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
@@ -29,6 +29,7 @@
 	<property>
 		<name>xasecure.policymgr.clientssl.keystore.password</name>
 		<value>myKeyFilePassword</value>
+		<property-type>PASSWORD</property-type>
 		<description>password for keystore</description>
 	</property>
 
@@ -41,6 +42,7 @@
 	<property>
 		<name>xasecure.policymgr.clientssl.truststore.password</name>
 		<value>changeit</value>
+		<property-type>PASSWORD</property-type>
 		<description>java  truststore password</description>
 	</property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
index 1106efa..d5f07a9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
@@ -47,6 +47,7 @@
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
index 401fa48..d4a6d45 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
@@ -29,6 +29,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.keystore.password</name>
     <value>myKeyFilePassword</value>
+    <property-type>PASSWORD</property-type>
     <description>password for keystore</description>
   </property>
 
@@ -41,6 +42,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.truststore.password</name>
     <value>changeit</value>
+    <property-type>PASSWORD</property-type>
     <description>java  truststore password</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
index 864d81b..1433d0a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-audit.xml
@@ -47,6 +47,7 @@
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
index dc9e04e..893652d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-plugin-properties.xml
@@ -28,13 +28,13 @@
 
   <property>
     <name>hadoop.rpc.protection</name>
-    <value>-</value>
+    <value></value>
     <description>Used for repository creation on ranger admin</description>
   </property>
 
   <property>
     <name>common.name.for.certificate</name>
-    <value>-</value>
+    <value></value>
     <description>Used for repository creation on ranger admin</description>
   </property>
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
index 6cdd80a..447320f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/ranger-kafka-policymgr-ssl.xml
@@ -29,6 +29,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.keystore.password</name>
     <value>myKeyFilePassword</value>
+    <property-type>PASSWORD</property-type>
     <description>password for keystore</description>
   </property>
 
@@ -41,6 +42,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.truststore.password</name>
     <value>changeit</value>
+    <property-type>PASSWORD</property-type>
     <description>java  truststore password</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
index a70bfc6..ba8710a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
@@ -47,6 +47,7 @@
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
index b56bf4f..a39ff0b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
@@ -29,6 +29,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.keystore.password</name>
     <value>myKeyFilePassword</value>
+    <property-type>PASSWORD</property-type>
     <description>password for keystore</description>
   </property>
 
@@ -41,6 +42,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.truststore.password</name>
     <value>changeit</value>
+    <property-type>PASSWORD</property-type>
     <description>java  truststore password</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
index c76afd5..6878db4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -56,19 +56,20 @@
 
   <property>
     <name>ranger.service.https.attrib.keystore.keyalias</name>
-    <value>mkey</value>
+    <value>rangeradmin</value>
     <description></description>
   </property>
 
   <property>
     <name>ranger.service.https.attrib.keystore.pass</name>
-    <value>ranger</value>
+    <value>xasecure</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 
   <property>
     <name>ranger.https.attrib.keystore.file</name>
-    <value>/etc/ranger/admin/keys/server.jks</value>
+    <value>/etc/ranger/admin/conf/ranger-admin-keystore.jks</value>
     <description></description>
   </property>
 
@@ -251,6 +252,7 @@
   <property>
     <name>ranger.audit.solr.password</name>
     <value>NONE</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property> 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
index 7552043..3687e88 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
@@ -47,6 +47,7 @@
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
index 855e6fd..4fc6452 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
@@ -29,6 +29,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.keystore.password</name>
     <value>myKeyFilePassword</value>
+    <property-type>PASSWORD</property-type>
     <description>password for keystore</description>
   </property>
 
@@ -41,6 +42,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.truststore.password</name>
     <value>changeit</value>
+    <property-type>PASSWORD</property-type>
     <description>java  truststore password</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
index 2cc354a..044f8ec 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
@@ -47,6 +47,7 @@
   <property>
     <name>xasecure.audit.destination.db.password</name>
     <value>crypted</value>
+    <property-type>PASSWORD</property-type>
     <description></description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
index 3f14655..db456da 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-plugin-properties.xml
@@ -28,7 +28,7 @@
 
   <property>
     <name>hadoop.rpc.protection</name>
-    <value>-</value>
+    <value></value>
     <description>Used for repository creation on ranger admin</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
index 32154f3..8dbe0c2 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
@@ -29,6 +29,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.keystore.password</name>
     <value>myKeyFilePassword</value>
+    <property-type>PASSWORD</property-type>
     <description>password for keystore</description>
   </property>
 
@@ -41,6 +42,7 @@
   <property>
     <name>xasecure.policymgr.clientssl.truststore.password</name>
     <value>changeit</value>
+    <property-type>PASSWORD</property-type>
     <description>java  truststore password</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index 1110da0..f4be8c7 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -807,6 +807,15 @@ hdp22properties.push(
   },
   {
     "id": "site property",
+    "name": "hadoop.rpc.protection",
+    "displayName": "hadoop.rpc.protection",
+    "category": "Advanced ranger-hdfs-plugin-properties",
+    "isRequired": false,
+    "serviceName": "HDFS",
+    "filename": "ranger-hdfs-plugin-properties.xml"
+  },  
+  {
+    "id": "site property",
     "name": "common.name.for.certificate",
     "displayName": "common.name.for.certificate",
     "category": "Advanced ranger-hive-plugin-properties",

http://git-wip-us.apache.org/repos/asf/ambari/blob/615c2d69/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 53d663c..c29e640 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -422,6 +422,33 @@ hdp23properties.push({
   },
   {
     "id": "site property",
+    "name": "hadoop.rpc.protection",
+    "displayName": "hadoop.rpc.protection",
+    "isRequired": false,
+    "filename": "ranger-kafka-plugin-properties.xml",
+    "category": "Advanced ranger-kafka-plugin-properties",
+    "serviceName": "KAFKA"
+  },
+  {
+    "id": "site property",
+    "name": "common.name.for.certificate",
+    "displayName": "common.name.for.certificate",
+    "isRequired": false,
+    "filename": "ranger-kafka-plugin-properties.xml",
+    "category": "Advanced ranger-kafka-plugin-properties",
+    "serviceName": "KAFKA"
+  },
+  {
+    "id": "site property",
+    "name": "hadoop.rpc.protection",
+    "displayName": "hadoop.rpc.protection",
+    "isRequired": false,
+    "filename": "ranger-yarn-plugin-properties.xml",
+    "category": "Advanced ranger-yarn-plugin-properties",
+    "serviceName": "KAFKA"
+  },
+  {
+    "id": "site property",
     "name": "xasecure.audit.provider.summary.enabled",
     "displayName": "Audit provider summary enabled",
     "displayType": "checkbox",