Revert "AMBARI-7933. Knox configuration changes for topology label and users.ldif file. (sumit gupta via jaimin jetly)"

This reverts commit 1e7607b892f01bed811e3092a208a29c87d61bb3.

ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/configuration/topology.xml → ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/configuration/ambari-topology.xml

@@ -110,7 +110,7 @@
         </topology>
     </value>
     <description>
-        The configuration specifies the Hadoop cluster services Knox will provide access to.
+        content for topology file for Knox.
     </description>
     </property>
 </configuration>

ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/metainfo.xml

@@ -79,7 +79,7 @@
       <configuration-dependencies>
         <config-type>gateway-site</config-type>
         <config-type>gateway-log4j</config-type>
-        <config-type>topology</config-type>
+        <config-type>ambari-topology</config-type>
       </configuration-dependencies>
     </service>
   </services>

ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/ldap.py

@@ -30,7 +30,7 @@ def ldap():
          content=params.ldap_log4j
     )
 
-    File(format("{params.knox_conf_dir}/users.ldif"),
+    File(format("{params.knox_conf_dir}/users-ldif"),
          mode=0644,
          group=params.knox_group,
          owner=params.knox_user,

ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py

@@ -116,7 +116,7 @@ knox_master_secret = config['configurations']['knox-env']['knox_master_secret']
 knox_master_secret_path = '/var/lib/knox/data/security/master'
 knox_host_name = config['clusterHostInfo']['knox_gateway_hosts'][0]
 knox_host_port = config['configurations']['gateway-site']['gateway.port']
-topology_template = config['configurations']['topology']['content']
+topology_template = config['configurations']['ambari-topology']['content']
 gateway_log4j = config['configurations']['gateway-log4j']['content']
 ldap_log4j = config['configurations']['ldap-log4j']['content']
 users_ldif = config['configurations']['users-ldif']['content']

ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py

@@ -51,7 +51,7 @@ class TestKnoxGateway(RMFTestCase):
     self.assertResourceCalled('File', '/etc/knox/conf/topologies/default.xml',
                               group='knox',
                               owner = 'knox',
-                              content = InlineTemplate(self.getConfig()['configurations']['topology']['content'])
+                              content = InlineTemplate(self.getConfig()['configurations']['ambari-topology']['content'])
     )
     self.assertResourceCalled('Execute', '/usr/lib/knox/bin/knoxcli.sh create-master --master sa',
                               user='knox',

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

@@ -1642,8 +1642,8 @@ module.exports =
       "isRequired": false,
       "showLabel": false,
       "serviceName": "KNOX",
-      "filename": "topology.xml",
-      "category": "Advanced topology"
+      "filename": "ambari-topology.xml",
+      "category": "Advanced ambari-topology"
     },
 
     {

ambari-web/app/models/stack_service.js

@@ -352,7 +352,7 @@ App.StackService.configCategories = function () {
 
   // Add custom section for every configType to all the services
   configTypes.forEach(function (type) {
-    var configTypesWithNoCustomSection = ['capacity-scheduler','mapred-queue-acls','flume-conf', 'pig-properties','topology','users-ldif'];
+    var configTypesWithNoCustomSection = ['capacity-scheduler','mapred-queue-acls','flume-conf', 'pig-properties','ambari-topology','users-ldif'];
     if (type.endsWith('-env') || type.endsWith('-log4j') || configTypesWithNoCustomSection.contains(type)) {
       return;
     }