svn commit: r1467360 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/admin/security/disable.js ambari-web/app/data/config_mapping.js ambari-web/app/data/secure_mapping.js

[ja...@apache.org]

Author: jaimin
Date: Fri Apr 12 17:18:22 2013
New Revision: 1467360

URL: http://svn.apache.org/r1467360
Log:
AMBARI-1912. HBase master doesn't come up after disabling security. (jaimin)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js
    incubator/ambari/trunk/ambari-web/app/data/config_mapping.js
    incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467360&r1=1467359&r2=1467360&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 12 17:18:22 2013
@@ -697,6 +697,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1912: HBase master doesn't come up after disabling security. (jaimin)
+
  AMBARI-1902: RegionServer does not start in secure cluster. (jaimin)
 
  AMBARI-1903. Host Exception Popup layout and cosmetic issues. (srimanth)

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js?rev=1467360&r1=1467359&r2=1467360&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/disable.js Fri Apr 12 17:18:22 2013
@@ -319,6 +319,9 @@ App.MainAdminSecurityDisableController =
               case 'hbase.coprocessor.master.classes':
                 _serviceConfigTags.configs[configName] = 'org.apache.hadoop.hbase.security.access.AccessController';
                 break;
+              case 'zookeeper.znode.parent':
+                _serviceConfigTags.configs[configName] = '/hbase-unsecure';
+                break;
               default:
                 delete _serviceConfigTags.configs[configName];
             }

Modified: incubator/ambari/trunk/ambari-web/app/data/config_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_mapping.js?rev=1467360&r1=1467359&r2=1467360&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_mapping.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_mapping.js Fri Apr 12 17:18:22 2013
@@ -857,6 +857,13 @@ var configs = [
     "foreignKey": null,
     "value": "<templateName[0]>",
     "filename": "hbase-site.xml"
+  },
+  {
+    "name": "zookeeper.znode.parent",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "/hbase-unsecure",
+    "filename": "hbase-site.xml"
   }
 ];
 

Modified: incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js?rev=1467360&r1=1467359&r2=1467360&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js Fri Apr 12 17:18:22 2013
@@ -354,6 +354,13 @@ module.exports = [
     "foreignKey": null,
     "value": "/apps/hbase/staging",
     "filename": "hbase-site.xml"
+  },
+  {
+    "name": "zookeeper.znode.parent",
+    "templateName": [],
+    "foreignKey": null,
+    "value": "/hbase-secure",
+    "filename": "hbase-site.xml"
   }
 ];