Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6C04F101EA for ; Mon, 1 Jul 2013 23:39:06 +0000 (UTC) Received: (qmail 16128 invoked by uid 500); 1 Jul 2013 23:39:06 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 16093 invoked by uid 500); 1 Jul 2013 23:39:06 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 16086 invoked by uid 99); 1 Jul 2013 23:39:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jul 2013 23:39:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jul 2013 23:39:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4672823888A6; Mon, 1 Jul 2013 23:38:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1498742 - in /incubator/ambari/trunk/ambari-web/app: controllers/main/admin/security/add/step3.js data/secure_mapping.js Date: Mon, 01 Jul 2013 23:38:43 -0000 To: ambari-commits@incubator.apache.org From: jaimin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130701233843.4672823888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jaimin Date: Mon Jul 1 23:38:42 2013 New Revision: 1498742 URL: http://svn.apache.org/r1498742 Log: AMBARI-2533. WebHcat tests fail since the proxy group and hosts is not set for HTTP principle. (jaimin) Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js?rev=1498742&r1=1498741&r2=1498742&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js (original) +++ incubator/ambari/trunk/ambari-web/app/controllers/main/admin/security/add/step3.js Mon Jul 1 23:38:42 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/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=1498742&r1=1498741&r2=1498742&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js (original) +++ incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js Mon Jul 1 23:38:42 2013 @@ -457,6 +457,22 @@ module.exports = [ "value": "", "filename": "core-site.xml", "serviceName": "OOZIE" + }, + { + "name": "hadoop.proxyuser..groups", + "templateName": ["proxyuser_group"], + "foreignKey": ["webHCat_http_primary_name"], + "value": "", + "filename": "core-site.xml", + "serviceName": "WEBHCAT" + }, + { + "name": "hadoop.proxyuser..hosts", + "templateName": ["webhcat_server"], + "foreignKey": ["webHCat_http_primary_name"], + "value": "", + "filename": "core-site.xml", + "serviceName": "WEBHCAT" } ];