You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/02/22 04:21:19 UTC

git commit: AMBARI-4793: Pig Service Check failed after disabling security on non preconfigured cluster. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/trunk dfe1fe043 -> 793cad52d


AMBARI-4793: Pig Service Check failed after disabling security on non preconfigured cluster. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/793cad52
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/793cad52
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/793cad52

Branch: refs/heads/trunk
Commit: 793cad52da74ba5e04f67474263b90d875c5bda2
Parents: dfe1fe0
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Fri Feb 21 19:20:35 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Fri Feb 21 19:20:35 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/controllers/main/admin/security/disable.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/793cad52/ambari-web/app/controllers/main/admin/security/disable.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/disable.js b/ambari-web/app/controllers/main/admin/security/disable.js
index 1f15afa..b7ea1a5 100644
--- a/ambari-web/app/controllers/main/admin/security/disable.js
+++ b/ambari-web/app/controllers/main/admin/security/disable.js
@@ -73,7 +73,7 @@ App.MainAdminSecurityDisableController = App.MainAdminSecurityProgressController
 
 
   loadSecureServices: function () {
-    var secureServices = require('data/secure_configs');
+    var secureServices = App.get('isHadoop2Stack')?require('data/HDP2/secure_configs'):require('data/secure_configs');
     var installedServices = App.Service.find().mapProperty('serviceName');
     this.get('secureServices').pushObject(secureServices.findProperty('serviceName', 'GENERAL'));
     //General (only non service tab) tab is always displayed
@@ -97,8 +97,6 @@ App.MainAdminSecurityDisableController = App.MainAdminSecurityProgressController
             }
           }, this);
           _serviceConfigTags.configs.security_enabled = 'false';
-          _serviceConfigTags.configs.dfs_datanode_address = '50010';
-          _serviceConfigTags.configs.dfs_datanode_http_address = '50075';
         } else {
           this.get('secureMapping').filterProperty('filename', _serviceConfigTags.siteName + '.xml').forEach(function (_config) {
             var configName = _config.name;