浏览代码

AMBARI-12645 Ranger Admin properties issues 2. (ababiichuk)

aBabiichuk 10 年之前
父节点
当前提交
683ea1a06e

+ 3 - 3
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>

+ 1 - 1
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>

+ 1 - 1
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,

+ 1 - 19
ambari-web/app/data/HDP2.3/site_properties.js

@@ -676,19 +676,6 @@ hdp23properties.push({
     "filename": "tez-site.xml",
     "category": "Advanced tez-site"
   },
-  {
-    "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",
@@ -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"

+ 4 - 1
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;
         }