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/08/07 15:21:17 UTC
ambari git commit: AMBARI-12645 Ranger Admin properties issues 2.
(ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 7b8262cba -> df7b16fe7
AMBARI-12645 Ranger Admin properties issues 2. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df7b16fe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df7b16fe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df7b16fe
Branch: refs/heads/branch-2.1
Commit: df7b16fe7eb373ace16db9069fdb773c1c076bf5
Parents: 7b8262c
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Fri Aug 7 16:17:11 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Fri Aug 7 16:17:11 2015 +0300
----------------------------------------------------------------------
.../0.4.0/configuration/admin-properties.xml | 6 +++---
.../RANGER/0.4.0/configuration/ranger-env.xml | 2 +-
ambari-web/app/data/HDP2.2/site_properties.js | 2 +-
ambari-web/app/data/HDP2.3/site_properties.js | 20 +-------------------
ambari-web/app/utils/config.js | 5 ++++-
5 files changed, 10 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/df7b16fe/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 0d7457f..0558d21 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
@@ -47,7 +47,7 @@
<property require-input="true">
<name>db_root_password</name>
- <value>vagrant</value>
+ <value></value>
<property-type>PASSWORD</property-type>
<description>Database password for the database admin user-id</description>
</property>
@@ -72,7 +72,7 @@
<property require-input="true">
<name>db_password</name>
- <value>rangeradmin</value>
+ <value></value>
<property-type>PASSWORD</property-type>
<description>Database password for the Ranger schema</description>
</property>
@@ -91,7 +91,7 @@
<property require-input="true">
<name>audit_db_password</name>
- <value>rangerlogger</value>
+ <value></value>
<property-type>PASSWORD</property-type>
<description>Database password for storing auditlog information</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/df7b16fe/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 7367f76..3eb86fb 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
@@ -55,7 +55,7 @@
<property>
<name>ranger_admin_password</name>
- <value>ambari123</value>
+ <value></value>
<property-type>PASSWORD</property-type>
<description>This is the ambari user password created for creating repositories and policies in Ranger Admin for each plugin</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/df7b16fe/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 2cea8a0..730907f 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -419,7 +419,7 @@ hdp22properties.push(
"id": "site property",
"name": "ranger_admin_password",
"displayName": "Ranger Admin user's password for Ambari",
- "recommendedValue": "ambari",
+ "recommendedValue": "",
"isReconfigurable": true,
"displayType": "password",
"isOverridable": false,
http://git-wip-us.apache.org/repos/asf/ambari/blob/df7b16fe/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 68cfbc1..f1fb484 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -678,19 +678,6 @@ hdp23properties.push({
},
{
"id": "puppet var",
- "name": "ranger.external.url",
- "displayName": "External URL",
- "recommendedValue": "http://localhost:6080",
- "isReconfigurable": true,
- "displayType": "",
- "isOverridable": false,
- "isVisible": true,
- "serviceName": "RANGER",
- "filename": "ranger-admin-site.xml",
- "category": "RangerSettings"
- },
- {
- "id": "puppet var",
"name": "ranger.externalurl",
"displayName": "External URL",
"recommendedValue": "http://localhost:6080",
@@ -747,15 +734,10 @@ hdp23properties.push({
"category": "RangerSettings"
},
{
- "id": "puppet var",
+ "id": "site property",
"name": "policymgr_external_url",
"displayName": "External URL",
- "recommendedValue": "http://localhost:6080",
- "isReconfigurable": true,
- "displayType": "",
"isOverridable": false,
- "isVisible": false,
- "isRequired": false,
"serviceName": "RANGER",
"filename": "admin-properties.xml",
"category": "RangerSettings"
http://git-wip-us.apache.org/repos/asf/ambari/blob/df7b16fe/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 28bd696..7d9250d 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -285,7 +285,10 @@ App.config = Em.Object.create({
serviceConfigObj.value = serviceConfigObj.savedValue = formattedValue;
serviceConfigObj.isFinal = serviceConfigObj.savedIsFinal = finalAttributes[index] === "true";
serviceConfigObj.isEditable = this.getIsEditable(serviceConfigObj, selectedConfigGroup, canEdit);
- serviceConfigObj.isVisible = serviceConfigObj.isVisible === false ? false : serviceName === 'MISC' ? true : serviceConfigObj.displayType !== 'user';
+ serviceConfigObj.isVisible = serviceConfigObj.isVisible !== false || serviceName === 'MISC';
+ if (serviceName!='MISC' && serviceConfigObj.category === "Users and Groups") {
+ serviceConfigObj.category = this.getDefaultCategory(advancedConfig, filename);
+ }
serviceConfigObj.serviceName = serviceName;
}