You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/02/06 23:56:38 UTC
ambari git commit: Revert "AMBARI-9480. Ranger password properties
are incorrectly included in Blueprint export. (rnettleton)"
Repository: ambari
Updated Branches:
refs/heads/trunk 655e1e81b -> bdee006b5
Revert "AMBARI-9480. Ranger password properties are incorrectly included in Blueprint export. (rnettleton)"
Reverting since this breaks UI.
This reverts commit 9736a20990e9c35b295a0647742cd4e8291426a3.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bdee006b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bdee006b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bdee006b
Branch: refs/heads/trunk
Commit: bdee006b55527a94a8240e218e3fba1e807c384e
Parents: 655e1e8
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Fri Feb 6 14:56:13 2015 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Fri Feb 6 14:56:31 2015 -0800
----------------------------------------------------------------------
.../configuration/ranger-knox-plugin-properties.xml | 16 +++++++---------
.../ranger-hbase-plugin-properties.xml | 14 ++++++--------
.../configuration/ranger-hdfs-plugin-properties.xml | 14 ++++++--------
.../configuration/ranger-hive-plugin-properties.xml | 14 ++++++--------
.../ranger-storm-plugin-properties.xml | 14 ++++++--------
5 files changed, 31 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdee006b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
index 9cf3d92..b744658 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/ranger-knox-plugin-properties.xml
@@ -38,9 +38,9 @@
<description>Used for repository creation on ranger admin</description>
</property>
- <property require-input="true">
+ <property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
- <value></value>
+ <value>admin-password</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -135,10 +135,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_KEYSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>myKeyFilePassword</value>
<description></description>
</property>
@@ -148,11 +147,10 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>changeit</value>
<description></description>
</property>
-</configuration>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdee006b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
index 3afdb1c..fdc2c7c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/ranger-hbase-plugin-properties.xml
@@ -32,9 +32,9 @@
<description>Used for repository creation on ranger admin</description>
</property>
- <property require-input="true">
+ <property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
- <value></value>
+ <value>hbase</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -123,10 +123,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_KEYSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>myKeyFilePassword</value>
<description></description>
</property>
@@ -136,10 +135,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>changeit</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdee006b/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 af8b5b3..7bb6a8a 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
@@ -44,9 +44,9 @@
<description>Used for repository creation on ranger admin</description>
</property>
- <property require-input="true">
+ <property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
- <value></value>
+ <value>hadoop</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -135,10 +135,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_KEYSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>myKeyFilePassword</value>
<description></description>
</property>
@@ -148,10 +147,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>changeit</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdee006b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
index 2c655bb..3ee693e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/ranger-hive-plugin-properties.xml
@@ -45,9 +45,9 @@
<description>Used for repository creation on ranger admin</description>
</property>
- <property require-input="true">
+ <property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
- <value></value>
+ <value>hive</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -136,10 +136,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_KEYSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>myKeyFilePassword</value>
<description></description>
</property>
@@ -149,10 +148,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>changeit</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/bdee006b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
index da1c645..1c28f03 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/STORM/configuration/ranger-storm-plugin-properties.xml
@@ -38,9 +38,9 @@
<description>Used for repository creation on ranger admin</description>
</property>
- <property require-input="true">
+ <property>
<name>REPOSITORY_CONFIG_PASSWORD</name>
- <value></value>
+ <value>stormclient</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
</property>
@@ -129,10 +129,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_KEYSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>myKeyFilePassword</value>
<description></description>
</property>
@@ -142,10 +141,9 @@
<description></description>
</property>
- <property require-input="true">
+ <property>
<name>SSL_TRUSTSTORE_PASSWORD</name>
- <value></value>
- <property-type>PASSWORD</property-type>
+ <value>changeit</value>
<description></description>
</property>