ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject svn commit: r1498743 - in /incubator/ambari/branches/branch-1.2.5/ambari-web/app: controllers/main/admin/security/add/step3.js data/secure_mapping.js
Date Mon, 01 Jul 2013 23:39:22 GMT
Author: jaimin
Date: Mon Jul  1 23:39:21 2013
New Revision: 1498743

URL: http://svn.apache.org/r1498743
Log:
AMBARI-2533. WebHcat tests fail since the proxy group and hosts is not set for HTTP principle.
(jaimin)

Modified:
    incubator/ambari/branches/branch-1.2.5/ambari-web/app/controllers/main/admin/security/add/step3.js
    incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/secure_mapping.js

Modified: incubator/ambari/branches/branch-1.2.5/ambari-web/app/controllers/main/admin/security/add/step3.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.5/ambari-web/app/controllers/main/admin/security/add/step3.js?rev=1498743&r1=1498742&r2=1498743&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.5/ambari-web/app/controllers/main/admin/security/add/step3.js
(original)
+++ incubator/ambari/branches/branch-1.2.5/ambari-web/app/controllers/main/admin/security/add/step3.js
Mon Jul  1 23:39:21 2013
@@ -356,6 +356,15 @@ App.MainAdminSecurityAddStep3Controller 
         value: hiveHostName
       });
     }
+    var webHcatComponent =  App.Service.find('WEBHCAT').get('hostComponents').findProperty('componentName',
'WEBHCAT_SERVER');
+    if(this.isWebHcatSelected() && webHcatComponent) {
+     var webHcatHostName =  webHcatComponent.get('host.hostName');
+      this.get('globalProperties').pushObject({
+        id: 'puppet var',
+        name: 'webhcat_server',
+        value: webHcatHostName
+      });
+    }
   },
 
   loadStaticGlobal: function () {

Modified: incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/secure_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/secure_mapping.js?rev=1498743&r1=1498742&r2=1498743&view=diff
==============================================================================
--- incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/secure_mapping.js (original)
+++ incubator/ambari/branches/branch-1.2.5/ambari-web/app/data/secure_mapping.js Mon Jul 
1 23:39:21 2013
@@ -457,6 +457,22 @@ module.exports = [
     "value": "<templateName[0]>",
     "filename": "core-site.xml",
     "serviceName": "OOZIE"
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
+    "templateName": ["proxyuser_group"],
+    "foreignKey": ["webHCat_http_primary_name"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "serviceName": "WEBHCAT"
+  },
+  {
+    "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
+    "templateName": ["webhcat_server"],
+    "foreignKey": ["webHCat_http_primary_name"],
+    "value": "<templateName[0]>",
+    "filename": "core-site.xml",
+    "serviceName": "WEBHCAT"
   }
 ];
 



Mime
View raw message