Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E406A1810C for ; Fri, 31 Jul 2015 17:58:10 +0000 (UTC) Received: (qmail 15751 invoked by uid 500); 31 Jul 2015 17:58:10 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 15723 invoked by uid 500); 31 Jul 2015 17:58:10 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 15714 invoked by uid 99); 31 Jul 2015 17:58:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 17:58:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B941E03C0; Fri, 31 Jul 2015 17:58:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jaimin@apache.org To: commits@ambari.apache.org Message-Id: <419044be089e444ab964d36146dc6738@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-12598. kafka_client_jaas.conf not being managed by Ambari. (Sriharsha Chintalapani via jaimin) Date: Fri, 31 Jul 2015 17:58:10 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 69a29494c -> 3a2381f58 AMBARI-12598. kafka_client_jaas.conf not being managed by Ambari. (Sriharsha Chintalapani via jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a2381f5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a2381f5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a2381f5 Branch: refs/heads/trunk Commit: 3a2381f589c291721cbc740ed68fce10d50f3a2c Parents: 69a2949 Author: Jaimin Jetly Authored: Fri Jul 31 10:55:57 2015 -0700 Committer: Jaimin Jetly Committed: Fri Jul 31 10:57:54 2015 -0700 ---------------------------------------------------------------------- .../KAFKA/0.8.1.2.2/package/scripts/kafka.py | 3 ++ .../package/templates/kafka_client_jaas.conf.j2 | 29 ++++++++++++++++++++ 2 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3a2381f5/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py index 4210e96..11492a7 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py @@ -91,6 +91,9 @@ def kafka(): TemplateConfig(format("{conf_dir}/kafka_jaas.conf"), owner=params.kafka_user) + TemplateConfig(format("{conf_dir}/kafka_client_jaas.conf"), + owner=params.kafka_user) + setup_symlink(params.kafka_managed_pid_dir, params.kafka_pid_dir) setup_symlink(params.kafka_managed_log_dir, params.kafka_log_dir) http://git-wip-us.apache.org/repos/asf/ambari/blob/3a2381f5/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2 new file mode 100644 index 0000000..7f81d85 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/templates/kafka_client_jaas.conf.j2 @@ -0,0 +1,29 @@ +{# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#} +KafkaClient { + com.sun.security.auth.module.Krb5LoginModule required + useTicketCache=true + renewTicket=true + serviceName="{{kafka_bare_jaas_principal}}"; +}; +Client { + com.sun.security.auth.module.Krb5LoginModule required + useTicketCache=true + renewTicket=true + serviceName="zookeeper"; +};