Revert "AMBARI-9471 Ambari Web UI changes required to support Ranger Installation part 2. (ababiichuk)"

This reverts commit 55feab5fb19ff45d4e1c2fe807ac98ce7c36be51.

ambari-web/app/data/HDP2.2/hbase_properties.js

@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-var properties = {
-
-  'SSLRangerSettings': [
-    'SSL_KEYSTORE_FILE_PATH',
-    'SSL_KEYSTORE_PASSWORD',
-    'SSL_TRUSTSTORE_FILE_PATH',
-    'SSL_TRUSTSTORE_PASSWORD'
-  ],
-
-  'RepositoryConfigs': [
-    'POLICY_USER',
-    'REPOSITORY_CONFIG_PASSWORD',
-    'REPOSITORY_CONFIG_USERNAME'
-  ],
-
-  'HDFSAuditSettings': [
-    'XAAUDIT.HDFS.DESTINATION_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY',
-    'XAAUDIT.HDFS.DESTINTATION_FILE',
-    'XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FILE',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT'
-  ]
-};
-
-var props = [];
-
-for (var category in properties) {
-  props = props.concat(App.config.generateConfigPropertiesByName(properties[category],
-    { category: category, serviceName: 'HBASE', filename: 'ranger-hbase-plugin-properties.xml'}));
-}
-
-module.exports = props;
-

ambari-web/app/data/HDP2.2/hdfs_properties.js

@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-var properties = {
-
-  'SSLRangerSettings': [
-    'SSL_KEYSTORE_FILE_PATH',
-    'SSL_KEYSTORE_PASSWORD',
-    'SSL_TRUSTSTORE_FILE_PATH',
-    'SSL_TRUSTSTORE_PASSWORD'
-  ],
-
-  'RepositoryConfigs': [
-    'POLICY_USER',
-    'REPOSITORY_CONFIG_PASSWORD',
-    'REPOSITORY_CONFIG_USERNAME'
-  ],
-
-  'HDFSAuditSettings': [
-    'XAAUDIT.HDFS.DESTINATION_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY',
-    'XAAUDIT.HDFS.DESTINTATION_FILE',
-    'XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FILE',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT'
-  ]
-};
-
-var props = [];
-
-for (var category in properties) {
-  props = props.concat(App.config.generateConfigPropertiesByName(properties[category],
-    { category: category, serviceName: 'HDFS', filename: 'ranger-hdfs-plugin-properties.xml'}));
-}
-
-module.exports = props;
-

ambari-web/app/data/HDP2.2/hive_properties.js

@@ -106,33 +106,6 @@ var hivePropsByCategory = {
     'hive.compactor.check.interval',
     'hive.compactor.delta.num.threshold',
     'hive.compactor.delta.pct.threshold'
-  ],
-
-  'SSLRangerSettings': [
-    'SSL_KEYSTORE_FILE_PATH',
-    'SSL_KEYSTORE_PASSWORD',
-    'SSL_TRUSTSTORE_FILE_PATH',
-    'SSL_TRUSTSTORE_PASSWORD'
-  ],
-
-  'RepositoryConfigs': [
-    'POLICY_USER',
-    'REPOSITORY_CONFIG_PASSWORD',
-    'REPOSITORY_CONFIG_USERNAME'
-  ],
-
-  'HDFSAuditSettings': [
-    'XAAUDIT.HDFS.DESTINATION_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY',
-    'XAAUDIT.HDFS.DESTINTATION_FILE',
-    'XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FILE',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT'
   ]
 };
 
@@ -140,7 +113,7 @@ var hiveProps = [];
 
 for (var category in hivePropsByCategory) {
   hiveProps = hiveProps.concat(App.config.generateConfigPropertiesByName(hivePropsByCategory[category], 
-    { category: category, serviceName: 'HIVE', filename: ['HDFSAuditSettings', 'RepositoryConfigs', 'SSLRangerSettings'].contains(category) ? 'ranger-hive-plugin-properties.xml' : 'hive-site.xml'}));
+    { category: category, serviceName: 'HIVE', filename: 'hive-site.xml'}));
 }
 
 module.exports = hiveProps;

ambari-web/app/data/HDP2.2/knox_properties.js

@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-var properties = {
-
-  'SSLRangerSettings': [
-    'SSL_KEYSTORE_FILE_PATH',
-    'SSL_KEYSTORE_PASSWORD',
-    'SSL_TRUSTSTORE_FILE_PATH',
-    'SSL_TRUSTSTORE_PASSWORD'
-  ],
-
-  'RepositoryConfigs': [
-    'POLICY_USER',
-    'REPOSITORY_CONFIG_PASSWORD',
-    'REPOSITORY_CONFIG_USERNAME'
-  ],
-
-  'HDFSAuditSettings': [
-    'XAAUDIT.HDFS.DESTINATION_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY',
-    'XAAUDIT.HDFS.DESTINTATION_FILE',
-    'XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FILE',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT'
-  ]
-};
-
-var props = [];
-
-for (var category in properties) {
-  props = props.concat(App.config.generateConfigPropertiesByName(properties[category],
-    { category: category, serviceName: 'KNOX', filename: 'ranger-knox-plugin-properties.xml'}));
-}
-
-module.exports = props;
-

ambari-web/app/data/HDP2.2/site_properties.js

@@ -21,14 +21,8 @@ var App = require('app');
 var hdp22SepcificProperties = [
   require('data/HDP2.2/yarn_properties'),
   require('data/HDP2.2/tez_properties'),
-  require('data/HDP2.2/hive_properties'),
-  require('data/HDP2.2/hdfs_properties'),
-  require('data/HDP2.2/hbase_properties'),
-  require('data/HDP2.2/storm_properties'),
-  require('data/HDP2.2/knox_properties')
-].reduce(function (p, c) {
-    return c.concat(p);
-  });
+  require('data/HDP2.2/hive_properties')
+].reduce(function(p, c) { return c.concat(p); });
 
 var hdp2properties = require('data/HDP2/site_properties').configProperties;
 var excludedConfigs = [
@@ -119,7 +113,7 @@ hdp22properties.push(
     "displayType": "checkbox",
     "dependentConfigPattern": "^XAAUDIT.HDFS",
     "filename": "ranger-hdfs-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-hdfs-plugin-properties",
     "serviceName": "HDFS"
   },
   {
@@ -128,7 +122,7 @@ hdp22properties.push(
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-hdfs-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-hdfs-plugin-properties",
     "serviceName": "HDFS"
   },
   {
@@ -138,34 +132,24 @@ hdp22properties.push(
     "displayName": "Enable Ranger for HDFS",
     "isOverridable": false,
     "filename": "ranger-hdfs-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-hdfs-plugin-properties",
     "serviceName": "HDFS"
   },
   {
-    "id": "site property",
-    "name": "POLICY_USER",
-    "value": "ambari-qa",
-    "defaultValue": "ambari-qa",
-    "displayName": "policy User for HDFS",
-    "filename": "ranger-hdfs-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "HDFS"
-  },
-  {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_PASSWORD",
-    "displayName": "Ranger repository config password",
-    "filename": "ranger-hdfs-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "HDFS"
-  },
-  {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_USERNAME",
-    "displayName": "Ranger repository config user",
+    "id": "puppet var",
+    "name": "RANGER_HOST",
+    "displayName": "Policy Admin URL",
+    "value": "",
+    "defaultValue": "",
+    "description": "The host that has been assigned to run Ranger Server",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isVisible": true,
+    "isRequiredByAgent": false,
+    "isRequired": false,
+    "serviceName": "HDFS",
     "filename": "ranger-hdfs-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "HDFS"
+    "category": "Advanced ranger-hdfs-plugin-properties"
   },
   /*********RANGER FOR HIVE************/
   {
@@ -175,7 +159,7 @@ hdp22properties.push(
     "displayType": "checkbox",
     "dependentConfigPattern": "^XAAUDIT.HDFS",
     "filename": "ranger-hive-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-hive-plugin-properties",
     "serviceName": "HIVE"
   },
   {
@@ -184,7 +168,7 @@ hdp22properties.push(
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-hive-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-hive-plugin-properties",
     "serviceName": "HIVE"
   },
   {
@@ -194,45 +178,35 @@ hdp22properties.push(
     "displayName": "Enable Ranger for HIVE",
     "isOverridable": false,
     "filename": "ranger-hive-plugin-properties.xml",
-    "category": "RangerSettings",
-    "serviceName": "HIVE"
-  },
-  {
-    "id": "site property",
-    "name": "POLICY_USER",
-    "value": "ambari-qa",
-    "defaultValue": "ambari-qa",
-    "displayName": "policy User for HIVE",
-    "filename": "ranger-hive-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "HIVE"
-  },
-  {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_PASSWORD",
-    "displayName": "Ranger repository config password",
-    "filename": "ranger-hive-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "HIVE"
-  },
-  {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_USERNAME",
-    "displayName": "Ranger repository config user",
-    "filename": "ranger-hive-plugin-properties.xml",
-    "category": "RepositoryConfigs",
+    "category": "Advanced ranger-hive-plugin-properties",
     "serviceName": "HIVE"
   },
   {
     "id": "site property",
     "name": "UPDATE_XAPOLICIES_ON_GRANT_REVOKE",
     "defaultValue": true,
-    "displayType": "checkbox",
     "displayName": "Should Hive GRANT/REVOKE update XA policies?",
+    "displayType": "checkbox",
     "filename": "ranger-hive-plugin-properties.xml",
-    "category": "GrantSettings",
+    "category": "Advanced ranger-hive-plugin-properties",
     "serviceName": "HIVE"
   },
+  {
+    "id": "puppet var",
+    "name": "RANGER_HOST",
+    "displayName": "Policy Admin URL",
+    "value": "",
+    "defaultValue": "",
+    "description": "The host that has been assigned to run Ranger Server",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isVisible": true,
+    "isRequiredByAgent": false,
+    "isRequired": false,
+    "serviceName": "HIVE",
+    "filename": "ranger-hive-plugin-properties.xml",
+    "category": "Advanced ranger-hive-plugin-properties"
+  },
   /*********RANGER FOR HBASE************/
   {
     "id": "site property",
@@ -241,7 +215,7 @@ hdp22properties.push(
     "displayType": "checkbox",
     "dependentConfigPattern": "^XAAUDIT.HDFS",
     "filename": "ranger-hbase-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-hbase-plugin-properties",
     "serviceName": "HBASE"
   },
   {
@@ -250,7 +224,7 @@ hdp22properties.push(
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-hbase-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-hbase-plugin-properties",
     "serviceName": "HBASE"
   },
   {
@@ -260,33 +234,7 @@ hdp22properties.push(
     "displayName": "Enable Ranger for HBASE",
     "isOverridable": false,
     "filename": "ranger-hbase-plugin-properties.xml",
-    "category": "RangerSettings",
-    "serviceName": "HBASE"
-  },
-  {
-    "id": "site property",
-    "name": "POLICY_USER",
-    "value": "ambari-qa",
-    "defaultValue": "ambari-qa",
-    "displayName": "policy User for HBASE",
-    "filename": "ranger-hbase-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "HBASE"
-  },
-  {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_PASSWORD",
-    "displayName": "Ranger repository config password",
-    "filename": "ranger-hbase-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "HBASE"
-  },
-  {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_USERNAME",
-    "displayName": "Ranger repository config user",
-    "filename": "ranger-hbase-plugin-properties.xml",
-    "category": "RepositoryConfigs",
+    "category": "Advanced ranger-hbase-plugin-properties",
     "serviceName": "HBASE"
   },
   {
@@ -296,9 +244,25 @@ hdp22properties.push(
     "displayName": "Should HBase GRANT/REVOKE update XA policies?",
     "displayType": "checkbox",
     "filename": "ranger-hbase-plugin-properties.xml",
-    "category": "GrantSettings",
+    "category": "Advanced ranger-hbase-plugin-properties",
     "serviceName": "HBASE"
   },
+  {
+    "id": "puppet var",
+    "name": "RANGER_HOST",
+    "displayName": "Policy Admin URL",
+    "value": "",
+    "defaultValue": "",
+    "description": "The host that has been assigned to run Ranger Server",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isVisible": true,
+    "isRequiredByAgent": false,
+    "isRequired": false,
+    "serviceName": "HBASE",
+    "filename": "ranger-hbase-plugin-properties.xml",
+    "category": "Advanced ranger-hbase-plugin-properties"
+  },
   /*********RANGER FOR STORM************/
   {
     "id": "site property",
@@ -307,7 +271,7 @@ hdp22properties.push(
     "displayType": "checkbox",
     "dependentConfigPattern": "^XAAUDIT.HDFS",
     "filename": "ranger-storm-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-storm-plugin-properties",
     "serviceName": "STORM"
   },
   {
@@ -316,7 +280,7 @@ hdp22properties.push(
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-storm-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced storm-hbase-plugin-properties",
     "serviceName": "STORM"
   },
   {
@@ -326,34 +290,24 @@ hdp22properties.push(
     "displayName": "Enable Ranger for STORM",
     "isOverridable": false,
     "filename": "ranger-storm-plugin-properties.xml",
-    "category": "RangerSettings",
-    "serviceName": "STORM"
-  },
-  {
-    "id": "site property",
-    "name": "POLICY_USER",
-    "value": "ambari-qa",
-    "defaultValue": "ambari-qa",
-    "displayName": "policy User for STORM",
-    "filename": "ranger-storm-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "STORM"
-  },
-  {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_PASSWORD",
-    "displayName": "Ranger repository config password",
-    "filename": "ranger-storm-plugin-properties.xml",
-    "category": "RepositoryConfigs",
+    "category": "Advanced ranger-storm-plugin-properties",
     "serviceName": "STORM"
   },
   {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_USERNAME",
-    "displayName": "Ranger repository config user",
+    "id": "puppet var",
+    "name": "RANGER_HOST",
+    "displayName": "Policy Admin URL",
+    "value": "",
+    "defaultValue": "",
+    "description": "The host that has been assigned to run Ranger Server",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isVisible": true,
+    "isRequiredByAgent": false,
+    "isRequired": false,
+    "serviceName": "STORM",
     "filename": "ranger-storm-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "STORM"
+    "category": "Advanced ranger-strom-plugin-properties"
   },
   /*********RANGER FOR KNOX************/
   {
@@ -363,7 +317,7 @@ hdp22properties.push(
     "displayType": "checkbox",
     "dependentConfigPattern": "^XAAUDIT.HDFS",
     "filename": "ranger-knox-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-knox-plugin-properties",
     "serviceName": "KNOX"
   },
   {
@@ -372,7 +326,7 @@ hdp22properties.push(
     "displayName": "Audit to DB",
     "displayType": "checkbox",
     "filename": "ranger-knox-plugin-properties.xml",
-    "category": "RangerSettings",
+    "category": "Advanced ranger-knox-plugin-properties",
     "serviceName": "KNOX"
   },
   {
@@ -382,36 +336,42 @@ hdp22properties.push(
     "displayName": "Enable Ranger for KNOX",
     "isOverridable": false,
     "filename": "ranger-knox-plugin-properties.xml",
-    "category": "RangerSettings",
-    "serviceName": "KNOX"
-  },
-  {
-    "id": "site property",
-    "name": "POLICY_USER",
-    "value": "ambari-qa",
-    "defaultValue": "ambari-qa",
-    "displayName": "policy User for KNOX",
-    "filename": "ranger-knox-plugin-properties.xml",
-    "category": "RepositoryConfigs",
+    "category": "Advanced ranger-knox-plugin-properties",
     "serviceName": "KNOX"
   },
   {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_PASSWORD",
-    "displayName": "Ranger repository config password",
+    "id": "puppet var",
+    "name": "RANGER_HOST",
+    "displayName": "Policy Admin URL",
+    "value": "",
+    "defaultValue": "",
+    "description": "The host that has been assigned to run Ranger Server",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isVisible": true,
+    "isRequiredByAgent": false,
+    "isRequired": false,
+    "serviceName": "KNOX",
     "filename": "ranger-knox-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "KNOX"
+    "category": "Advanced ranger-knox-plugin-properties"
   },
+  /**********************************************RANGER***************************************/
   {
-    "id": "site property",
-    "name": "REPOSITORY_CONFIG_USERNAME",
-    "displayName": "Ranger repository config user",
-    "filename": "ranger-knox-plugin-properties.xml",
-    "category": "RepositoryConfigs",
-    "serviceName": "KNOX"
+    "id": "puppet var",
+    "name": "RANGER_HOST",
+    "displayName": "Policy Admin URL",
+    "value": "",
+    "defaultValue": "",
+    "description": "The host that has been assigned to run Ranger Server",
+    "displayType": "masterHost",
+    "isOverridable": false,
+    "isVisible": true,
+    "isRequiredByAgent": false,
+    "isRequired": false,
+    "serviceName": "RANGER",
+    "filename": "admin-properties.xml",
+    "category": "Advanced admin-properties"
   },
-  /**********************************************RANGER***************************************/
   {
     "id": "site property",
     "name": "ambari_user_password",
@@ -603,7 +563,7 @@ hdp22properties.push(
     "isVisible": true,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
-    "category": "RangerSettings"
+    "category": "Advanced admin-properties"
   },
   {
     "id": "puppet var",
@@ -616,7 +576,7 @@ hdp22properties.push(
     "isVisible": true,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
-    "category": "RangerSettings"
+    "category": "Advanced admin-properties"
   },
   {
     "id": "puppet var",
@@ -629,7 +589,7 @@ hdp22properties.push(
     "isVisible": true,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
-    "category": "RangerSettings"
+    "category": "Advanced admin-properties"
   },
   {
     "id": "puppet var",
@@ -642,7 +602,7 @@ hdp22properties.push(
     "isVisible": true,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
-    "category": "RangerSettings"
+    "category": "Advanced admin-properties"
   },
   {
     "id": "site property",
@@ -660,7 +620,7 @@ hdp22properties.push(
       },
       {
         displayName: 'UNIX',
-        foreignKeys: ['remoteLoginEnabled', 'authServiceHostName', 'authServicePort']
+        foreignKeys: ['remoteLoginEnabled', 'authServiceHostName','authServicePort']
       },
       {
         displayName: 'NONE'
@@ -673,10 +633,10 @@ hdp22properties.push(
     "isVisible": true,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
-    "category": "RangerSettings"
+    "category": "Advanced admin-properties"
   },
   {
-    "id": "site property",
+    "id": "puppet var",
     "name": "remoteLoginEnabled",
     "displayName": "Allow remote Login",
     "defaultValue": true,
@@ -686,93 +646,13 @@ hdp22properties.push(
     "isVisible": true,
     "serviceName": "RANGER",
     "filename": "admin-properties.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "id": "site property",
-    "name": "authServiceHostName",
-    "displayName": "authServiceHostName",
-    "defaultValue": 'localhost',
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "id": "site property",
-    "name": "authServicePort",
-    "displayName": "authServicePort",
-    "defaultValue": '5151',
-    "isReconfigurable": true,
-    "displayType": "int",
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "UnixAuthenticationSettings"
-  },
-  {
-    "id": "site property",
-    "name": "xa_ldap_url",
-    "displayName": "xa_ldap_url",
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "id": "site property",
-    "name": "xa_ldap_userDNpattern",
-    "displayName": "xa_ldap_userDNpattern",
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "id": "site property",
-    "name": "xa_ldap_groupRoleAttribute",
-    "displayName": "xa_ldap_groupRoleAttribute",
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "LDAPSettings"
-  },
-  {
-    "id": "site property",
-    "name": "xa_ldap_ad_domain",
-    "displayName": "xa_ldap_ad_domain",
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "ADSettings"
-  },
-  {
-    "id": "site property",
-    "name": "xa_ldap_ad_url",
-    "displayName": "xa_ldap_ad_url",
-    "isReconfigurable": true,
-    "isOverridable": false,
-    "isVisible": true,
-    "serviceName": "RANGER",
-    "filename": "admin-properties.xml",
-    "category": "ADSettings"
+    "category": "Advanced admin-properties"
   }
 );
 
 var additionalProperties = [];
 
-hdp22SepcificProperties.forEach(function (config) {
+hdp22SepcificProperties.forEach(function(config) {
   if (!hdp22properties.findProperty('name', config.name)) additionalProperties.push(config);
   else {
     hdp22properties.findProperty('name', config.name).category = config.category;

ambari-web/app/data/HDP2.2/storm_properties.js

@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var App = require('app');
-
-var properties = {
-
-  'SSLRangerSettings': [
-    'SSL_KEYSTORE_FILE_PATH',
-    'SSL_KEYSTORE_PASSWORD',
-    'SSL_TRUSTSTORE_FILE_PATH',
-    'SSL_TRUSTSTORE_PASSWORD'
-  ],
-
-  'RepositoryConfigs': [
-    'POLICY_USER',
-    'REPOSITORY_CONFIG_PASSWORD',
-    'REPOSITORY_CONFIG_USERNAME'
-  ],
-
-  'HDFSAuditSettings': [
-    'XAAUDIT.HDFS.DESTINATION_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_DIRECTORY',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_DIRECTORY',
-    'XAAUDIT.HDFS.DESTINTATION_FILE',
-    'XAAUDIT.HDFS.DESTINTATION_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.DESTINTATION_OPEN_RETRY_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FILE',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_FLUSH_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_BUFFER_ROLLOVER_INTERVAL_SECONDS',
-    'XAAUDIT.HDFS.LOCAL_ARCHIVE_MAX_FILE_COUNT'
-  ]
-};
-
-var props = [];
-
-for (var category in properties) {
-  props = props.concat(App.config.generateConfigPropertiesByName(properties[category],
-    { category: category, serviceName: 'STORM', filename: 'ranger-storm-plugin-properties.xml'}));
-}
-
-module.exports = props;
-

ambari-web/app/models/stack_service.js

@@ -163,8 +163,7 @@ App.StackService = DS.Model.extend({
     var configTypes = this.get('configTypes');
     var serviceComponents = this.get('serviceComponents');
     if (configTypes && Object.keys(configTypes).length) {
-      var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "KDC", "Kadmin",
-        "^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "RepositoryConfigs", "Settings$"];
+      var pattern = ["General", "CapacityScheduler", "FaultTolerance", "Isolation", "Performance", "KDC", "Kadmin","^Advanced", "Env$", "^Custom", "Falcon - Oozie integration", "FalconStartupSite", "FalconRuntimeSite", "MetricCollector", "Settings$"];
       configCategories = App.StackService.configCategories.call(this).filter(function (_configCategory) {
         var serviceComponentName = _configCategory.get('name');
         var isServiceComponent = serviceComponents.someProperty('componentName', serviceComponentName);
@@ -215,7 +214,6 @@ App.StackService.reviewPageHandlers = {
     'Database': 'loadOozieDbValue'
   }
 };
-App.StackService.RangerAgents = ['HDFS','HBASE','HIVE','KNOX','STORM'];
 
 App.StackService.configCategories = function () {
   var serviceConfigCategories = [];
@@ -255,16 +253,14 @@ App.StackService.configCategories = function () {
         App.ServiceConfigCategory.create({ name: 'HIVE_METASTORE', displayName: 'Hive Metastore'}),
         App.ServiceConfigCategory.create({ name: 'WEBHCAT_SERVER', displayName: 'WebHCat Server'}),
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
-        App.ServiceConfigCategory.create({ name: 'Performance', displayName: 'Performance'}),
-        App.ServiceConfigCategory.create({ name: 'GrantSettings', displayName: 'Grant/Revoke Settings'})
+        App.ServiceConfigCategory.create({ name: 'Performance', displayName: 'Performance'})
       ]);
       break;
     case 'HBASE':
       serviceConfigCategories.pushObjects([
         App.ServiceConfigCategory.create({ name: 'HBASE_MASTER', displayName: 'HBase Master'}),
         App.ServiceConfigCategory.create({ name: 'HBASE_REGIONSERVER', displayName: 'RegionServer'}),
-        App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
-        App.ServiceConfigCategory.create({ name: 'GrantSettings', displayName: 'Grant/Revoke Settings'})
+        App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
       ]);
       break;
     case 'ZOOKEEPER':
@@ -332,11 +328,7 @@ App.StackService.configCategories = function () {
     case 'RANGER':
       serviceConfigCategories.pushObjects([
         App.ServiceConfigCategory.create({ name: 'AdminSettings', displayName: 'Admin Settings'}),
-        App.ServiceConfigCategory.create({ name: 'DBSettings', displayName: 'DB Settings'}),
-        App.ServiceConfigCategory.create({ name: 'RangerSettings', displayName: 'Ranger Settings'}),
-        App.ServiceConfigCategory.create({ name: 'UnixAuthenticationSettings', displayName: 'Unix Authentication Settings'}),
-        App.ServiceConfigCategory.create({ name: 'ADSettings', displayName: 'AD Settings'}),
-        App.ServiceConfigCategory.create({ name: 'LDAPSettings', displayName: 'LDAP Settings'})
+        App.ServiceConfigCategory.create({ name: 'DBSettings', displayName: 'DB Settings'})
       ]);
       break;
     case 'PIG':
@@ -350,12 +342,6 @@ App.StackService.configCategories = function () {
   }
   serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({ name: 'Advanced', displayName: 'Advanced'}));
 
-  if (App.StackService.RangerAgents.contains(this.get('serviceName'))) {
-    serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({ name: 'RangerSettings', displayName: 'Ranger Settings'}));
-    serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({ name: 'HDFSAuditSettings', displayName: 'HDFS Audit Settings'}));
-    serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({ name: 'RepositoryConfigs', displayName: 'Ranger plugin repository and policy users'}));
-    serviceConfigCategories.pushObject(App.ServiceConfigCategory.create({ name: 'SSLRangerSettings', displayName: 'SSL Settings'}));
-  }
   var configTypes = Object.keys(this.get('configTypes'));
 
   //Falcon has dependency on oozie-site but oozie-site advanced/custom section should not be shown on Falcon page

ambari-web/app/views/common/controls_view.js

@@ -278,7 +278,7 @@ App.ServiceConfigCheckboxWithDependencies = App.ServiceConfigCheckbox.extend({
 
   showHideDependentConfigs: function() {
     if (this.get('serviceConfig.dependentConfigPattern')) {
-      this.get('parentView.serviceConfigs').forEach(function(c) {
+      this.get('categoryConfigsAll').forEach(function(c) {
         if (c.get('name').match(this.get('serviceConfig.dependentConfigPattern')) && c.get('name') != this.get('serviceConfig.name'))
           c.set('isVisible', this.get('checked'))
       }, this);
@@ -580,8 +580,8 @@ App.ServiceConfigRadioButton = Ember.Checkbox.extend({
         components.forEach(function (_component) {
           if (_component.foreignKeys) {
             _component.foreignKeys.forEach(function (_componentName) {
-              if (this.get('parentView.parentView.serviceConfigs').someProperty('name', _componentName)) {
-                var component = this.get('parentView.parentView.serviceConfigs').findProperty('name', _componentName);
+              if (this.get('parentView.categoryConfigsAll').someProperty('name', _componentName)) {
+                var component = this.get('parentView.categoryConfigsAll').findProperty('name', _componentName);
                 component.set('isVisible', _component.displayName === this.get('value'));
               }
             }, this);

ambari-web/test/models/stack_service_test.js

@@ -266,10 +266,6 @@ describe('App.StackService', function () {
       expect(ss.get('configCategories').mapProperty('name')).to.eql([
         "General",
         "Advanced",
-        "RangerSettings",
-        "HDFSAuditSettings",
-        "RepositoryConfigs",
-        "SSLRangerSettings",
         "Advanced key",
         "Custom key"
       ]);
@@ -282,10 +278,6 @@ describe('App.StackService', function () {
         "DATANODE",
         "General",
         "Advanced",
-        "RangerSettings",
-        "HDFSAuditSettings",
-        "RepositoryConfigs",
-        "SSLRangerSettings",
         "Advanced key",
         "Custom key"]);
     });