You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/11/11 18:29:17 UTC
[3/3] ambari git commit: AMBARI-13840 Improve config loading time on
Installer and Add Service. (ababiichuk)
AMBARI-13840 Improve config loading time on Installer and Add Service. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5d43620
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5d43620
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5d43620
Branch: refs/heads/trunk
Commit: b5d436203f53f7c08cc2c141a90ae50af7bb33ec
Parents: ed62bae
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Nov 11 18:43:14 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Nov 11 19:26:27 2015 +0200
----------------------------------------------------------------------
.../1.6.1.2.2.0/configuration/accumulo-env.xml | 3 +
.../HDFS/2.1.0.2.0/configuration/ssl-client.xml | 6 +
.../HDFS/2.1.0.2.0/configuration/ssl-server.xml | 9 +
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 1 +
.../KNOX/0.5.0.2.2/configuration/knox-env.xml | 1 +
.../ranger-knox-plugin-properties.xml | 14 +-
.../4.0.0.2.0/configuration/oozie-site.xml | 1 +
.../4.2.0.2.3/configuration/oozie-site.xml | 1 +
.../0.4.0/configuration/admin-properties.xml | 3 +
.../RANGER/0.4.0/configuration/ranger-env.xml | 4 +
.../0.4.0/configuration/usersync-properties.xml | 3 +
.../0.5.0.2.3/configuration/kms-properties.xml | 12 +
.../services/HIVE/configuration/hive-site.xml | 3 +
.../services/OOZIE/configuration/oozie-site.xml | 4 +
.../services/HIVE/configuration/hive-site.xml | 4 +
.../services/HIVE/configuration/hive-site.xml | 4 +
.../YARN/configuration-mapred/ssl-client.xml | 6 +
.../YARN/configuration-mapred/ssl-server.xml | 9 +
.../services/HIVE/configuration/hive-site.xml | 1 +
.../ranger-hbase-plugin-properties.xml | 16 +-
.../ranger-hdfs-plugin-properties.xml | 12 +
.../services/HIVE/configuration/hive-site.xml | 1 +
.../ranger-hive-plugin-properties.xml | 14 +-
.../ranger-storm-plugin-properties.xml | 14 +-
.../services/HIVE/configuration/hive-site.xml | 3 +
.../services/OOZIE/configuration/oozie-site.xml | 1 +
.../HBASE/configuration/ranger-hbase-audit.xml | 3 +
.../ranger-hbase-policymgr-ssl.xml | 6 +
.../HDFS/configuration/ranger-hdfs-audit.xml | 3 +
.../configuration/ranger-hdfs-policymgr-ssl.xml | 6 +
.../HIVE/configuration/ranger-hive-audit.xml | 3 +
.../configuration/ranger-hive-policymgr-ssl.xml | 6 +
.../KAFKA/configuration/ranger-kafka-audit.xml | 3 +
.../ranger-kafka-plugin-properties.xml | 3 +
.../ranger-kafka-policymgr-ssl.xml | 6 +
.../KNOX/configuration/ranger-knox-audit.xml | 3 +
.../configuration/ranger-knox-policymgr-ssl.xml | 6 +
.../RANGER/configuration/admin-properties.xml | 1 +
.../RANGER/configuration/ranger-admin-site.xml | 14 ++
.../RANGER/configuration/ranger-ugsync-site.xml | 9 +
.../STORM/configuration/ranger-storm-audit.xml | 3 +
.../ranger-storm-policymgr-ssl.xml | 6 +
.../YARN/configuration/ranger-yarn-audit.xml | 3 +
.../ranger-yarn-plugin-properties.xml | 3 +
.../configuration/ranger-yarn-policymgr-ssl.xml | 6 +
.../HDPWIN/2.1/configuration/cluster-env.xml | 10 +
.../services/HIVE/configuration/hive-site.xml | 3 +
.../services/HDFS/configuration/hdfs-site.xml | 3 +
ambari-web/app/controllers/installer.js | 2 +-
.../main/admin/kerberos/step2_controller.js | 2 +-
.../main/admin/serviceAccounts_controller.js | 5 +-
.../controllers/main/service/info/configs.js | 24 +-
.../app/controllers/wizard/step7_controller.js | 127 ++++-------
.../app/controllers/wizard/step8_controller.js | 6 +-
ambari-web/app/data/HDP2.2/site_properties.js | 1 -
ambari-web/app/data/HDP2/site_properties.js | 52 +----
ambari-web/app/data/HDP2/ui_properties.js | 60 +++++
.../configs/stack_config_properties_mapper.js | 159 ++++++++++---
ambari-web/app/mappers/configs/themes_mapper.js | 69 +++---
.../mixins/common/configs/configs_comparator.js | 5 +-
.../mixins/common/configs/enhanced_configs.js | 31 +--
.../app/mixins/wizard/addSecurityConfigs.js | 5 +-
ambari-web/app/models.js | 1 -
.../app/models/configs/stack_config_property.js | 74 +++----
.../app/models/configs/theme/sub_section.js | 4 +-
.../app/models/configs/theme/sub_section_tab.js | 4 +-
ambari-web/app/utils/config.js | 222 +------------------
ambari-web/app/utils/configs_collection.js | 97 ++++++++
.../common/configs/overriddenProperty_view.js | 11 -
.../configs/service_config_layout_tab_view.js | 23 +-
ambari-web/app/views/common/controls_view.js | 4 +-
.../test/controllers/wizard/step7_test.js | 123 +---------
.../configs/config_versions_mapper_test.js | 11 +-
.../stack_config_properties_mapper_test.js | 2 +-
.../test/mappers/configs/themes_mapper_test.js | 21 +-
.../mixins/wizard/addSeccurityConfigs_test.js | 18 --
ambari-web/test/utils/config_test.js | 205 +----------------
77 files changed, 720 insertions(+), 907 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
index 1790a8a..2ab5f2e 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml
@@ -30,6 +30,7 @@
used to initialize Accumulo and to create the trace user. Changing this
will not change the password for the Accumulo root user.</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -42,6 +43,7 @@
processes must know in order to communicate with one
another.</description>
<value-attributes>
+ <type>password</type>
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
@@ -55,6 +57,7 @@
with this password if that user does not already exist. Changing this
will not change the password for the trace user.</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml
index 4513fdd..809d5c5 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-client.xml
@@ -33,6 +33,9 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
<name>ssl.client.truststore.reload.interval</name>
@@ -54,5 +57,8 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml
index f95793e..32199c0 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/ssl-server.xml
@@ -33,6 +33,9 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
<name>ssl.server.truststore.reload.interval</name>
@@ -54,11 +57,17 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
<name>ssl.server.keystore.keypassword</name>
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password for private key in keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index de2d900..b611d49 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -79,6 +79,7 @@ limitations under the License.
<display-name>Database Password</display-name>
<description>password to use against metastore database</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
index 7db053c..947bb70 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml
@@ -30,6 +30,7 @@
<property-type>PASSWORD</property-type>
<description>password to use as the master secret</description>
<value-attributes>
+ <type>password</type>
<editable-only-at-install>true</editable-only-at-install>
<overridable>false</overridable>
</value-attributes>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 1b5c6cb..af224cf 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
@@ -65,6 +65,9 @@
<value>admin-password</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -175,6 +178,9 @@
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
<value>10</value>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -201,6 +207,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -237,7 +246,10 @@
<name>XAAUDIT.DB.PASSWORD</name>
<value>{{xa_audit_db_password}}</value>
<property-type>PASSWORD</property-type>
- <description>Audit database password</description>
+ <description>Audit database password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
index 7371df4..1977532 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
@@ -242,6 +242,7 @@
if empty Configuration assumes it is NULL.
</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
index acf0809..681a60c 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
@@ -123,6 +123,7 @@
if empty Configuration assumes it is NULL.
</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
index 1ff4fd9..30e6c61 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/admin-properties.xml
@@ -86,6 +86,7 @@
<display-name>Database Admintrator (DBA) password</display-name>
<description>Database password for the database admin username</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -127,6 +128,7 @@
<display-name>Ranger DB password</display-name>
<description>Database password for the Ranger schema</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -158,6 +160,7 @@
<display-name>Ranger Audit DB password</display-name>
<description>Database password for storing auditlog information</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index 31608a9..d6ac20b 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -69,6 +69,7 @@
<display-name>Ranger Admin user's password for Ambari</display-name>
<description>This is the ambari user password created for creating repositories and policies in Ranger Admin for each plugin</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -84,6 +85,9 @@
<value>admin</value>
<property-type>PASSWORD</property-type>
<description>This is the password for default admin user that is used for creating ambari user in Ranger Admin</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
index 007f6a4..12de878 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
@@ -79,6 +79,9 @@
<value></value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
<name>CRED_KEYSTORE_FILENAME</name>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 6c37b94..e27562c 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
@@ -31,6 +31,9 @@
<value>keyadmin</value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -56,6 +59,9 @@
<value></value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -81,6 +87,9 @@
<value></value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -88,6 +97,9 @@
<value></value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml
index 87940a7..25e1dc2 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/configuration/hive-site.xml
@@ -56,6 +56,9 @@ limitations under the License.
<value></value>
<property-type>PASSWORD</property-type>
<description>password to use against metastore database</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml
index 83ca880..153bf3d 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/OOZIE/configuration/oozie-site.xml
@@ -231,6 +231,10 @@
IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value,
if empty Configuration assumes it is NULL.
</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HIVE/configuration/hive-site.xml
index ad1df07..01b11dd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/HIVE/configuration/hive-site.xml
@@ -54,6 +54,10 @@ limitations under the License.
<value></value>
<property-type>PASSWORD</property-type>
<description>password to use against metastore database</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HIVE/configuration/hive-site.xml
index ad1df07..01b11dd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/HIVE/configuration/hive-site.xml
@@ -54,6 +54,10 @@ limitations under the License.
<value></value>
<property-type>PASSWORD</property-type>
<description>password to use against metastore database</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml
index 4513fdd..809d5c5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-client.xml
@@ -33,6 +33,9 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
<name>ssl.client.truststore.reload.interval</name>
@@ -54,5 +57,8 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml
index f95793e..32199c0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/configuration-mapred/ssl-server.xml
@@ -33,6 +33,9 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the trust store file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
<name>ssl.server.truststore.reload.interval</name>
@@ -54,11 +57,17 @@
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password to open the keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
<name>ssl.server.keystore.keypassword</name>
<value>bigdata</value>
<property-type>PASSWORD</property-type>
<description>Password for private key in keystore file.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
index a9ce0e7..c8ba0a9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/configuration/hive-site.xml
@@ -78,6 +78,7 @@ limitations under the License.
<display-name>Database Password</display-name>
<description>password to use against metastore database</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 036681c..9911653 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
@@ -65,7 +65,10 @@
<value>hbase</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
- </property>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
+ </property>
<property>
<name>XAAUDIT.DB.IS_ENABLED</name>
@@ -169,6 +172,9 @@
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
<value>10</value>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -182,6 +188,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -241,7 +250,10 @@
<name>XAAUDIT.DB.PASSWORD</name>
<value>{{xa_audit_db_password}}</value>
<property-type>PASSWORD</property-type>
- <description>Audit database password</description>
+ <description>Audit database password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 0646e92..dcffc02 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
@@ -70,6 +70,9 @@
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin
</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -175,6 +178,9 @@
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
<value>10</value>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -188,6 +194,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -239,6 +248,9 @@
<value>{{xa_audit_db_password}}</value>
<property-type>PASSWORD</property-type>
<description>Audit database password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index fa81bf6..b17adbd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -355,6 +355,7 @@ limitations under the License.
<display-name>Database Password</display-name>
<description>password to use against metastore database</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 4fc1423..5b5f2d7 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
@@ -54,6 +54,9 @@
<value>hive</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -158,6 +161,9 @@
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
<value>10</value>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -171,6 +177,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -230,7 +239,10 @@
<name>XAAUDIT.DB.PASSWORD</name>
<value>{{xa_audit_db_password}}</value>
<property-type>PASSWORD</property-type>
- <description>Audit database password</description>
+ <description>Audit database password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 1fef03f..ff2ca82 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
@@ -65,6 +65,9 @@
<value>stormtestuser</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -169,6 +172,9 @@
<name>XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT</name>
<value>10</value>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -195,6 +201,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description></description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -231,7 +240,10 @@
<name>XAAUDIT.DB.PASSWORD</name>
<value>{{xa_audit_db_password}}</value>
<property-type>PASSWORD</property-type>
- <description>Audit database password</description>
+ <description>Audit database password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml
index c972ee5..3d251b3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/HIVE/configuration/hive-site.xml
@@ -54,6 +54,9 @@ limitations under the License.
<value> </value>
<property-type>PASSWORD</property-type>
<description>password to use against metastore database</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
index 0e54ad3..a1afa82 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/OOZIE/configuration/oozie-site.xml
@@ -240,6 +240,7 @@
if empty Configuration assumes it is NULL.
</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 57a11c3..f79f0ff 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
@@ -59,6 +59,9 @@
<value>crypted</value>
<property-type>PASSWORD</property-type>
<description>Audit DB JDBC Password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 654b7c7..8f349df 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
@@ -31,6 +31,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -44,6 +47,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 c15cfc3..703b078 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
@@ -59,6 +59,9 @@
<value>crypted</value>
<property-type>PASSWORD</property-type>
<description>Audit DB JDBC Password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 b51fefb..f526de6 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
@@ -31,6 +31,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -44,6 +47,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 dfac592..67c705b 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
@@ -59,6 +59,9 @@
<value>crypted</value>
<property-type>PASSWORD</property-type>
<description>Audit DB JDBC Password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 b8ae6ca..a8599b3 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
@@ -31,6 +31,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -44,6 +47,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 4317631..331daba 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
@@ -59,6 +59,9 @@
<value>crypted</value>
<property-type>PASSWORD</property-type>
<description>Audit DB JDBC Password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 8b96763..1ddd06c 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
@@ -78,6 +78,9 @@
<value>kafka</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 993de48..9ca4b43 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
@@ -31,6 +31,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -44,6 +47,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 d9a1021..94614c1 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
@@ -59,6 +59,9 @@
<value>crypted</value>
<property-type>PASSWORD</property-type>
<description>Audit DB JDBC Password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 b9c5da6..5e1c90e 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
@@ -31,6 +31,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -44,6 +47,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
index 837b26e..d20deec 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/admin-properties.xml
@@ -96,6 +96,7 @@
<display-name>Ranger DB root password</display-name>
<description>Database password for the database admin user-id</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 8af9782..b3eff80 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
@@ -70,6 +70,9 @@
<value>xasecure</value>
<property-type>PASSWORD</property-type>
<description>Password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -140,6 +143,9 @@
<value>_</value>
<property-type>PASSWORD</property-type>
<description>JDBC password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -260,6 +266,7 @@
<property-type>PASSWORD</property-type>
<description>Password for the account that can search for users</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -316,6 +323,7 @@
<property-type>PASSWORD</property-type>
<description>Password for the account that can search for users</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -361,6 +369,9 @@
<value>_</value>
<property-type>PASSWORD</property-type>
<description>JDBC password - audit</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -450,6 +461,9 @@
<value>NONE</value>
<property-type>PASSWORD</property-type>
<description>Solr password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
index 4f6399b..d61cf20 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-ugsync-site.xml
@@ -41,6 +41,9 @@
<value>UnIx529p</value>
<property-type>PASSWORD</property-type>
<description>Keystore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -54,6 +57,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>Truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -197,6 +203,9 @@
<value></value>
<property-type>PASSWORD</property-type>
<description>Password for the LDAP bind user used for searching users.</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 e946f52..60ab1378c 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
@@ -59,6 +59,9 @@
<value>crypted</value>
<property-type>PASSWORD</property-type>
<description>Audit DB JDBC Password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 6aac72d..cd0f44e 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
@@ -31,6 +31,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -44,6 +47,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 1f8eb59..fb7c120 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
@@ -59,6 +59,9 @@
<value>crypted</value>
<property-type>PASSWORD</property-type>
<description>Audit DB JDBC Password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 439db46..7daedaf 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
@@ -72,6 +72,9 @@
<value>yarn</value>
<property-type>PASSWORD</property-type>
<description>Used for repository creation on ranger admin</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 0489679..755b050 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
@@ -31,6 +31,9 @@
<value>myKeyFilePassword</value>
<property-type>PASSWORD</property-type>
<description>password for keystore</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
@@ -44,6 +47,9 @@
<value>changeit</value>
<property-type>PASSWORD</property-type>
<description>java truststore password</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
index a4d8acc..d80ad6c 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/configuration/cluster-env.xml
@@ -28,6 +28,7 @@
<property-type>USER</property-type>
<description>User to run Hadoop services under</description>
<value-attributes>
+ <visible>false</visible>
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
@@ -39,6 +40,7 @@
<property-type>PASSWORD</property-type>
<description>Password for hadoop user</description>
<value-attributes>
+ <type>password</type>
<overridable>false</overridable>
<editable-only-at-install>true</editable-only-at-install>
</value-attributes>
@@ -60,6 +62,8 @@
<value>false</value>
<description>Whether to ignore failures on users and group creation</description>
<value-attributes>
+ <visible>false</visible>
+ <type>boolean</type>
<overridable>false</overridable>
</value-attributes>
</property>
@@ -69,6 +73,9 @@
<value>ambari-qa</value>
<property-type>USER</property-type>
<description>User executing service checks</description>
+ <value-attributes>
+ <visible>false</visible>
+ </value-attributes>
</property>
<property>
<name>smokeuser_keytab</name>
@@ -81,5 +88,8 @@
<value>hadoop</value>
<property-type>GROUP</property-type>
<description>Hadoop user group.</description>
+ <value-attributes>
+ <visible>false</visible>
+ </value-attributes>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/configuration/hive-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/configuration/hive-site.xml
index 2b952d3..786c9ce 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/configuration/hive-site.xml
@@ -48,6 +48,9 @@ limitations under the License.
<value></value>
<property-type>PASSWORD</property-type>
<description>password to use against metastore database</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
index 680a35f..1c2acb6 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.5/services/HDFS/configuration/hdfs-site.xml
@@ -34,6 +34,9 @@
<property-type>PASSWORD</property-type>
<value></value>
<description>1</description>
+ <value-attributes>
+ <type>password</type>
+ </value-attributes>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 48c89c1..9c92282 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -233,7 +233,7 @@ App.InstallerController = App.WizardController.extend({
loadStacks: function () {
var stacks = this.get('content.stacks');
var dfd = $.Deferred();
- App.StackConfigProperty.find().clear();
+ App.configsCollection.clearAll();
App.Section.find().clear();
App.SubSection.find().clear();
App.SubSectionTab.find().clear();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index ddbcc5c..03b66c8 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -88,7 +88,7 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
//STEP 2: Load on-site configs by service from local DB
var storedConfigs = this.get('content.serviceConfigProperties');
//STEP 3: Merge pre-defined configs with loaded on-site configs
- this.set('configs', App.config.mergePreDefinedWithStack(this.get('selectedServiceNames')));
+ this.set('configs', App.cfgCollection.getAll());
App.config.setPreDefinedServiceConfigs(this.get('addMiscTabToPage'));
this.filterConfigs(this.get('configs'));
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
index 8f7f48c..92a4087 100644
--- a/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
+++ b/ambari-web/app/controllers/main/admin/serviceAccounts_controller.js
@@ -104,9 +104,8 @@ App.MainAdminServiceAccountsController = App.MainServiceInfoConfigsController.ex
*/
createConfigObject: function(serverConfigs) {
var configs = App.config.mergePredefinedWithSaved(serverConfigs, this.get('selectedService'));
- var miscConfigs = configs.filterProperty('displayType', 'user').filterProperty('category', 'Users and Groups').filterProperty('isVisible', true);
-
- miscConfigs = App.config.miscConfigVisibleProperty(miscConfigs, App.Service.find().mapProperty('serviceName').concat('MISC'));
+ var miscConfigs = configs.filterProperty('displayType', 'user').filterProperty('category', 'Users and Groups');
+ miscConfigs.setEach('isVisible', true);
// load specific users along the wizards which called <code>loadUsers</code> method
var wizardContentProperties = [
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index b464537..a79c66e 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -413,7 +413,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
*/
addDBProperties: function(configs) {
if (this.get('content.serviceName') === 'HIVE') {
- var propertyToAdd = App.config.get('preDefinedSitePropertiesMap')[App.config.configId('hive_hostname','hive-env')],
+ var propertyToAdd = App.configsCollection.getConfigByName('hive_hostname','hive-env'),
cfg = App.config.createDefaultConfig(propertyToAdd.name, propertyToAdd.serviceName, propertyToAdd.filename, true, propertyToAdd),
connectionUrl = configs.findProperty('name', 'javax.jdo.option.ConnectionURL');
if (cfg && connectionUrl) {
@@ -432,24 +432,10 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A
*/
mergeWithStackProperties: function (configs) {
this.get('settingsTabProperties').forEach(function (advanced) {
- if (!configs.someProperty('name', advanced.get('name'))) {
- configs.pushObject(App.ServiceConfigProperty.create({
- name: advanced.get('name'),
- displayName: advanced.get('displayName'),
- value: advanced.get('value'),
- savedValue: null,
- filename: advanced.get('fileName'),
- isUserProperty: false,
- isNotSaved: true,
- recommendedValue: advanced.get('value'),
- isFinal: advanced.get('isFinal'),
- recommendedIsFinal: advanced.get('recommendedIsFinal'),
- serviceName: advanced.get('serviceName'),
- supportsFinal: advanced.get('supportsFinal'),
- category: 'Advanced ' + App.config.getConfigTagFromFileName(advanced.get('fileName')),
- widget: advanced.get('widget'),
- widgetType: advanced.get('widgetType')
- }));
+ if (!configs.someProperty('name', advanced.name)) {
+ advanced.savedValue = null;
+ advanced.isNotSaved = true;
+ configs.pushObject(App.ServiceConfigProperty.create(advanced));
}
});
return configs;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index f5f78ff..4aa99bf 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -69,14 +69,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
secureConfigs: require('data/HDP2/secure_mapping'),
/**
- * config categories with secure properties
- * use only for add service wizard when security is enabled;
- */
- secureServices: function () {
- return $.extend(true, [], require('data/HDP2/secure_configs'));
- }.property(),
-
- /**
* If configChangeObserver Modal is shown
* @type {bool}
*/
@@ -551,9 +543,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
*/
resolveServiceDependencyConfigs: function (serviceName, configs) {
switch (serviceName) {
- case 'STORM':
- this.resolveStormConfigs(configs);
- break;
case 'YARN':
this.resolveYarnConfigs(configs);
break;
@@ -562,40 +551,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
/**
* Update some Storm configs
- * If Ganglia is selected to install or already installed, Ganglia host should be added to configs
- * @param {Ember.Enumerable} configs
- * @method resolveStormConfigs
- */
- resolveStormConfigs: function (configs) {
- var dependentConfigs, gangliaServerHost, gangliaHostId;
- dependentConfigs = ['nimbus.childopts', 'supervisor.childopts', 'worker.childopts'];
- var props = this.get('wizardController').getDBProperties(['masterComponentHosts', 'hosts']);
- var masterComponentHosts = props.masterComponentHosts;
- var hosts = props.hosts;
- // if Ganglia selected or installed, set ganglia host to configs
- if (this.get('installedServiceNames').contains('STORM') && this.get('installedServiceNames').contains('GANGLIA')) return;
- if (this.get('allSelectedServiceNames').contains('GANGLIA') || this.get('installedServiceNames').contains('GANGLIA')) {
- if (this.get('wizardController.name') === 'addServiceController') {
- gangliaServerHost = masterComponentHosts.findProperty('component', 'GANGLIA_SERVER').hostName;
- } else {
- gangliaHostId = masterComponentHosts.findProperty('component', 'GANGLIA_SERVER').host_id;
- for (var hostName in hosts) {
- if (hosts[hostName].id == gangliaHostId) gangliaServerHost = hosts[hostName].name;
- }
- }
- dependentConfigs.forEach(function (configName) {
- var config = configs.findProperty('name', configName);
- if (!Em.isNone(config.value)) {
- var replaceStr = config.value.match(/.jar=host[^,]+/)[0];
- var replaceWith = replaceStr.slice(0, replaceStr.lastIndexOf('=') - replaceStr.length + 1) + gangliaServerHost;
- config.value = config.recommendedValue = config.value.replace(replaceStr, replaceWith);
- }
- }, this);
- }
- },
-
- /**
- * Update some Storm configs
* If SLIDER is selected to install or already installed,
* some Yarn properties must be changed
* @param {Ember.Enumerable} configs
@@ -620,23 +575,23 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
if (!this.get('isConfigsLoaded')) {
return;
}
+ console.time('wizard loadStep: ');
this.clearStep();
var self = this;
- //STEP 2: Load on-site configs by service from local DB
- var storedConfigs = this.get('content.serviceConfigProperties');
- //STEP 3: Merge pre-defined configs with loaded on-site configs
- var configs = (storedConfigs && storedConfigs.length)
- ? storedConfigs
- : App.config.mergePreDefinedWithStack(this.get('selectedServiceNames').concat(this.get('installedServiceNames')));
+
App.config.setPreDefinedServiceConfigs(this.get('addMiscTabToPage'));
+ var storedConfigs = this.get('content.serviceConfigProperties');
+
+ var configs = (storedConfigs && storedConfigs.length) ? storedConfigs : App.configsCollection.getAll();
+
this.resolveConfigThemeConditions(configs);
this.set('groupsToDelete', this.get('wizardController').getDBProperty('groupsToDelete') || []);
if (this.get('wizardController.name') === 'addServiceController') {
App.router.get('configurationController').getConfigsByTags(this.get('serviceConfigTags')).done(function (loadedConfigs) {
- self.setInstalledServiceConfigs(self.get('serviceConfigTags'), configs, loadedConfigs, self.get('installedServiceNames'));
+ configs = self.setInstalledServiceConfigs(configs, loadedConfigs, self.get('installedServiceNames'));
self.applyServicesConfigs(configs, storedConfigs);
});
} else {
@@ -665,9 +620,9 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
themeResource = App.SubSectionTab.find().findProperty('name', configCondition.get('name'));
}
if (themeResource) {
- themeResource.get('configProperties').forEach(function (_config) {
+ themeResource.get('configProperties').forEach(function (_configId) {
configs.find(function (item) {
- if (item.name === _config.get('name') && item.filename === _config.get('fileName')) {
+ if (App.config.configId(item.name, item.filename) === _configId) {
item.hiddenBySection = !valueAttributes['visible'];
return true;
}
@@ -685,8 +640,8 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
if (this.get('allSelectedServiceNames').contains('YARN')) {
configs = App.config.fileConfigsIntoTextarea(configs, 'capacity-scheduler.xml', []);
}
- var dependedServices = ["STORM", "YARN"];
- dependedServices.forEach(function (serviceName) {
+
+ ["YARN"].forEach(function (serviceName) {
if (this.get('allSelectedServiceNames').contains(serviceName)) {
this.resolveServiceDependencyConfigs(serviceName, configs);
}
@@ -695,7 +650,8 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
if (App.get('isKerberosEnabled') && this.get('wizardController.name') == 'addServiceController') {
this.addKerberosDescriptorConfigs(configs, this.get('wizardController.kerberosDescriptorConfigs') || []);
}
- this.setStepConfigs(configs, storedConfigs);
+ var serviceConfigs = this.renderConfigs(configs, storedConfigs, this.get('allSelectedServiceNames'), this.get('installedServiceNames'));
+ this.setStepConfigs(serviceConfigs);
this.checkHostOverrideInstaller();
this.activateSpecialConfigs();
this.selectProperService();
@@ -725,6 +681,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
completeConfigLoading: function() {
this.clearDependentConfigsByService(App.StackService.find().filterProperty('isSelected').mapProperty('serviceName'));
+ console.timeEnd('wizard loadStep: ');
this.set('isRecommendedLoaded', true);
if (this.get('content.skipConfigStep')) {
App.router.send('next');
@@ -772,17 +729,10 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
* Set init <code>stepConfigs</code> value
* Set <code>selected</code> for addable services if addServiceController is used
* Remove SNameNode if HA is enabled (and if addServiceController is used)
- * @param {Ember.Object[]} configs
- * @param {Ember.Object[]} storedConfigs
+ * @param {Ember.Object[]} serviceConfigs
* @method setStepConfigs
*/
- setStepConfigs: function (configs, storedConfigs) {
- var localDB = {
- hosts: this.get('wizardController.content.hosts'),
- masterComponentHosts: this.get('wizardController.content.masterComponentHosts'),
- slaveComponentHosts: this.get('wizardController.content.slaveComponentHosts')
- };
- var serviceConfigs = this.renderConfigs(configs, storedConfigs, this.get('allSelectedServiceNames'), this.get('installedServiceNames'), localDB);
+ setStepConfigs: function (serviceConfigs) {
if (this.get('wizardController.name') === 'addServiceController') {
serviceConfigs.setEach('showConfig', true);
serviceConfigs.setEach('selected', false);
@@ -828,10 +778,14 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
* @param storedConfigs
* @param allSelectedServiceNames
* @param installedServiceNames
- * @param localDB
* @return {App.ServiceConfig[]}
*/
- renderConfigs: function (configs, storedConfigs, allSelectedServiceNames, installedServiceNames, localDB) {
+ renderConfigs: function (configs, storedConfigs, allSelectedServiceNames, installedServiceNames) {
+ var localDB = {
+ hosts: this.get('wizardController.content.hosts'),
+ masterComponentHosts: this.get('wizardController.content.masterComponentHosts'),
+ slaveComponentHosts: this.get('wizardController.content.slaveComponentHosts')
+ };
var renderedServiceConfigs = [];
var services = [];
@@ -1025,39 +979,42 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
/**
* set configs actual values from server
- * @param serviceConfigTags
* @param configs
* @param configsByTags
* @param installedServiceNames
* @method setInstalledServiceConfigs
*/
- setInstalledServiceConfigs: function (serviceConfigTags, configs, configsByTags, installedServiceNames) {
+ setInstalledServiceConfigs: function (configs, configsByTags, installedServiceNames) {
var configsMap = {};
- var configMixin = App.get('config');
- var nonServiceTab = require('data/service_configs');
configsByTags.forEach(function (configSite) {
configsMap[configSite.type] = configSite.properties || {};
});
- configs.forEach(function (_config) {
- var type = _config.filename ? App.config.getConfigTagFromFileName(_config.filename) : null;
- var mappedConfigValue = type && configsMap[type] ? configsMap[type][_config.name] : null;
- if (!Em.isNone(mappedConfigValue) && ((installedServiceNames && installedServiceNames.contains(_config.serviceName) || nonServiceTab.someProperty('serviceName', _config.serviceName)))) {
- // prevent overriding already edited properties
- if (_config.savedValue != mappedConfigValue || _config.displayType == 'password') {
+ var allConfigs = configs.filter(function (_config) {
+ if ((['MISC'].concat(installedServiceNames).contains(_config.serviceName))) {
+ var type = _config.filename ? App.config.getConfigTagFromFileName(_config.filename) : null;
+ var mappedConfigValue = type && configsMap[type] ? configsMap[type][_config.name] : null;
+ if (Em.isNone(mappedConfigValue)) {
+ return _config.serviceName == 'MISC';
+ } else {
+ if (_config.savedValue != mappedConfigValue) {
+ _config.savedValue = App.config.formatPropertyValue(_config, mappedConfigValue);
+ }
_config.value = App.config.formatPropertyValue(_config, mappedConfigValue);
+ _config.hasInitialValue = true;
+ delete configsMap[type][_config.name];
+ return true;
}
- _config.savedValue = App.config.formatPropertyValue(_config, mappedConfigValue);
- _config.hasInitialValue = true;
- delete configsMap[type][_config.name];
+ } else {
+ return true;
}
});
//add user properties
Em.keys(configsMap).forEach(function (filename) {
Em.keys(configsMap[filename]).forEach(function (propertyName) {
- configs.push(configMixin.createDefaultConfig(propertyName,
- configMixin.getServiceByConfigType(filename) ? configMixin.getServiceByConfigType(filename).get('serviceName') : 'MISC',
- configMixin.getOriginalFileName(filename),
+ allConfigs.push(App.config.createDefaultConfig(propertyName,
+ App.config.getServiceByConfigType(filename) ? App.config.getServiceByConfigType(filename).get('serviceName') : 'MISC',
+ App.config.getOriginalFileName(filename),
false, {
value: configsMap[filename][propertyName],
savedValue: configsMap[filename][propertyName],
@@ -1065,6 +1022,7 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
}));
});
});
+ return allConfigs;
},
/**
@@ -1266,7 +1224,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
miscConfigs.findProperty('name', 'user_group').set('value', this.get('content.group'));
}
}
- App.config.miscConfigVisibleProperty(miscConfigs, serviceToShow);
}
var wizardController = this.get('wizardController');
if (wizardController.get('name') === "kerberosWizardController") {
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 442c31d..aca43a0 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -861,7 +861,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
if (App.get('isKerberosEnabled') && !this.get('isManualKerberos')) {
this.updateKerberosDescriptor();
}
- var fileNamesToUpdate = this.get('wizardController').getDBProperty('fileNamesToUpdate');
+ var fileNamesToUpdate = this.get('wizardController').getDBProperty('fileNamesToUpdate').uniq();
if (fileNamesToUpdate && fileNamesToUpdate.length) {
this.updateConfigurations(fileNamesToUpdate);
}
@@ -1439,7 +1439,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
});
groupData.desired_configs = this.buildGroupDesiredConfigs(groupConfigs, timeTag);
// check for group from installed service
- if (configGroup.isForInstalledService === true) {
+ if (configGroup.is_for_installed_service === true) {
// if group is a new one, create it
if (!configGroup.id) {
sendData.push({"ConfigGroup": groupData});
@@ -1627,7 +1627,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
var miscConfigs = this.get('configs').filterProperty('serviceName', 'MISC'),
createNotification = miscConfigs.findProperty('name', 'create_notification').value;
if (createNotification !== 'yes') return;
- var predefinedNotificationConfigNames = require('data/HDP2/site_properties').configProperties.filterProperty('filename', 'alert_notification').mapProperty('name'),
+ var predefinedNotificationConfigNames = require('data/HDP2/alert_notification').mapProperty('name'),
configsForNotification = this.get('configs').filterProperty('filename', 'alert_notification');
var properties = {},
names = [
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 6cc59d9..03e0615 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -230,7 +230,6 @@ hdp22properties.push(
},
{
"name": "xa_ldap_url",
- "isOverridable": false,
"serviceName": "RANGER",
"filename": "admin-properties.xml",
"category": "LDAPSettings"
http://git-wip-us.apache.org/repos/asf/ambari/blob/b5d43620/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 7dfdbff..30591ec 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -379,15 +379,6 @@ var hdp2properties = [
"category": "OOZIE_SERVER",
"index": 9
},
- {
- "name": "oozie_hostname",
- "displayName": "Database Host",
- "displayType": "host",
- "serviceName": "OOZIE",
- "filename": "oozie-env.xml",
- "category": "OOZIE_SERVER",
- "index": 3
- },
/**********************************************HIVE***************************************/
{
@@ -478,21 +469,6 @@ var hdp2properties = [
"index": 2
},
{
- "name": "hive_hostname",
- "displayName": "Database Host",
- "description": "Specify the host on which the database is hosted",
- "recommendedValue": "",
- "isReconfigurable": true,
- "displayType": "host",
- "isOverridable": false,
- "isRequiredByAgent": false,
- "isVisible": true,
- "serviceName": "HIVE",
- "filename": "hive-env.xml",
- "category": "HIVE_METASTORE",
- "index": 3
- },
- {
"name": "hcat_log_dir",
"serviceName": "HIVE",
"filename": "hive-env.xml",
@@ -1522,28 +1498,6 @@ var hdp2properties = [
"index": 0
},
{
- "name": "admin_principal",
- "displayName": "Admin principal",
- "description": "Admin principal used to create principals and export key tabs (e.g. admin/admin@EXAMPLE.COM).",
- "isOverridable": false,
- "isRequiredByAgent": false,
- "serviceName": "KERBEROS",
- "filename": "krb5-conf.xml",
- "category": "Kadmin",
- "index": 1
- },
- {
- "name": "admin_password",
- "displayName": "Admin password",
- "displayType": "password",
- "isOverridable": false,
- "isRequiredByAgent": false,
- "serviceName": "KERBEROS",
- "filename": "krb5-conf.xml",
- "category": "Kadmin",
- "index": 2
- },
- {
"name": "manage_krb5_conf",
"dependentConfigPattern": "CATEGORY",
"serviceName": "KERBEROS",
@@ -1896,12 +1850,8 @@ var hdp2properties = [
if (App.get('isHadoopWindowsStack')) {
var excludedWindowsConfigs = [
- 'dfs.client.read.shortcircuit',
- 'knox_pid_dir',
- 'ignore_groupsusers_create',
'hive_database',
- 'oozie_database',
- 'override_hbase_uid'
+ 'oozie_database'
];
hdp2properties = hdp2properties.filter(function (item) {