Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 71159200B27 for ; Wed, 22 Jun 2016 11:45:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6FBD8160A35; Wed, 22 Jun 2016 09:45:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B6C9E160A2E for ; Wed, 22 Jun 2016 11:45:37 +0200 (CEST) Received: (qmail 39256 invoked by uid 500); 22 Jun 2016 09:45:36 -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 39247 invoked by uid 99); 22 Jun 2016 09:45:36 -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; Wed, 22 Jun 2016 09:45:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BF9C3DFEDA; Wed, 22 Jun 2016 09:45:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Message-Id: <5fe159e5516e4041b4d40721598a487b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17344. Clear /security.json config on solr znode when kerberos is disabled. (oleewere) Date: Wed, 22 Jun 2016 09:45:36 +0000 (UTC) archived-at: Wed, 22 Jun 2016 09:45:38 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 0ea1174d5 -> 18862ff09 AMBARI-17344. Clear /security.json config on solr znode when kerberos is disabled. (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18862ff0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18862ff0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18862ff0 Branch: refs/heads/branch-2.4 Commit: 18862ff09f9f41831e39394a76a3305a60315cf2 Parents: 0ea1174 Author: oleewere Authored: Wed Jun 22 11:29:00 2016 +0200 Committer: oleewere Committed: Wed Jun 22 11:45:13 2016 +0200 ---------------------------------------------------------------------- .../package/scripts/setup_logsearch_solr.py | 27 ++++++++++---------- .../python/stacks/2.4/LOGSEARCH/test_solr.py | 3 +++ 2 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/18862ff0/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch_solr.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch_solr.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch_solr.py index 33ba70c..ff10165 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch_solr.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/setup_logsearch_solr.py @@ -80,20 +80,21 @@ def setup_logsearch_solr(name = None): ) zk_cli_prefix = format('export JAVA_HOME={java64_home}; {cloud_scripts}/zkcli.sh -zkhost {zookeeper_quorum}') create_ambari_solr_znode(zk_cli_prefix) - if params.logsearch_solr_ssl_enabled: - Execute(format('{zk_cli_prefix}{logsearch_solr_znode} -cmd clusterprop -name urlScheme -val https'), - user=params.logsearch_solr_user - ) + + url_scheme = 'https' if params.logsearch_solr_ssl_enabled else 'http' + Execute(format('{zk_cli_prefix}{logsearch_solr_znode} -cmd clusterprop -name urlScheme -val {url_scheme}'), + user=params.logsearch_solr_user) + + if params.security_enabled: + File(format("{logsearch_solr_jaas_file}"), + content=Template("logsearch_solr_jaas.conf.j2"), + owner=params.logsearch_solr_user) + security_content = '\'{"authentication":{"class": "org.apache.solr.security.KerberosPlugin"}}\'' else: - Execute(format('{zk_cli_prefix}{logsearch_solr_znode} -cmd clusterprop -name urlScheme -val http'), - user=params.logsearch_solr_user - ) - if params.security_enabled: - File(format("{logsearch_solr_jaas_file}"), - content=Template("logsearch_solr_jaas.conf.j2"), - owner=params.logsearch_solr_user) - security_content = '\'{"authentication":{"class": "org.apache.solr.security.KerberosPlugin"}}\'' - Execute(format('{zk_cli_prefix} -cmd put {logsearch_solr_znode}/security.json ') + security_content) + security_content = '\'{}\'' + Execute(format('{zk_cli_prefix} -cmd put {logsearch_solr_znode}/security.json ') + security_content, + user=params.logsearch_solr_user) + elif name == 'client': solr_cloud_util.setup_solr_client(params.config) if params.security_enabled: http://git-wip-us.apache.org/repos/asf/ambari/blob/18862ff0/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_solr.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_solr.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_solr.py index 0474aed..0ef54f3 100644 --- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_solr.py +++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_solr.py @@ -106,6 +106,9 @@ class TestSolr(RMFTestCase): self.assertResourceCalled('Execute', 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45; /usr/lib/ambari-logsearch-solr/server/scripts/cloud-scripts/zkcli.sh -zkhost c6401.ambari.apache.org:2181/logsearch -cmd clusterprop -name urlScheme -val http', user = "solr" ) + self.assertResourceCalled('Execute', 'export JAVA_HOME=/usr/jdk64/jdk1.7.0_45; /usr/lib/ambari-logsearch-solr/server/scripts/cloud-scripts/zkcli.sh -zkhost c6401.ambari.apache.org:2181 -cmd put /logsearch/security.json \'{}\'', + user = "solr" + ) def test_configure_default(self): self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR + "/scripts/logsearch_solr.py",