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 0997D200BDC for ; Wed, 14 Dec 2016 09:58:08 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 082C7160B19; Wed, 14 Dec 2016 08:58:08 +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 06FCE160B13 for ; Wed, 14 Dec 2016 09:58:06 +0100 (CET) Received: (qmail 20097 invoked by uid 500); 14 Dec 2016 08:58:06 -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 20088 invoked by uid 99); 14 Dec 2016 08:58:06 -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, 14 Dec 2016 08:58:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1DC3BE3813; Wed, 14 Dec 2016 08:58:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mugdha@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18945 Allowing user to edit service name while enabling ranger plugin (mugdha) Date: Wed, 14 Dec 2016 08:58:06 +0000 (UTC) archived-at: Wed, 14 Dec 2016 08:58:08 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 fb86ef739 -> 96518477e AMBARI-18945 Allowing user to edit service name while enabling ranger plugin (mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/96518477 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/96518477 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/96518477 Branch: refs/heads/branch-2.5 Commit: 96518477edb76d0ea1f804db0239087aaa0fb584 Parents: fb86ef7 Author: Mugdha Varadkar Authored: Tue Dec 13 07:23:32 2016 +0530 Committer: Mugdha Varadkar Committed: Wed Dec 14 14:26:53 2016 +0530 ---------------------------------------------------------------------- .../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 3 +++ .../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 3 +++ .../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 3 +++ .../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 3 +++ .../common-services/KAFKA/0.8.1/package/scripts/params.py | 3 +++ .../KNOX/0.5.0.2.2/package/scripts/params_linux.py | 3 +++ .../RANGER_KMS/0.5.0.2.3/package/scripts/params.py | 3 +++ .../common-services/STORM/0.9.1/package/scripts/params_linux.py | 3 +++ .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 3 +++ 9 files changed, 27 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py index 32e1510..3d33a49 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py @@ -313,6 +313,9 @@ if has_ranger_admin and stack_supports_atlas_ranger_plugin: ) repo_name = str(config['clusterName']) + '_atlas' + repo_name_value = config['configurations']['ranger-atlas-security']['ranger.plugin.atlas.service.name'] + if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value ssl_keystore_password = unicode(config['configurations']['ranger-atlas-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) ssl_truststore_password = unicode(config['configurations']['ranger-atlas-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) credential_file = format('/etc/ranger/{repo_name}/cred.jceks') http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py index f47dc8f..8200a85 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py @@ -266,6 +266,9 @@ xa_audit_db_name = default('/configurations/admin-properties/audit_db_name', 'ra xa_audit_db_user = default('/configurations/admin-properties/audit_db_user', 'rangerlogger') xa_db_host = config['configurations']['admin-properties']['db_host'] repo_name = str(config['clusterName']) + '_hbase' +repo_name_value = config['configurations']['ranger-hbase-security']['ranger.plugin.hbase.service.name'] +if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value common_name_for_certificate = config['configurations']['ranger-hbase-plugin-properties']['common.name.for.certificate'] http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py index d86e360..0aac45e 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py @@ -407,6 +407,9 @@ xa_audit_db_name = default('/configurations/admin-properties/audit_db_name', 'ra xa_audit_db_user = default('/configurations/admin-properties/audit_db_user', 'rangerlogger') xa_db_host = config['configurations']['admin-properties']['db_host'] repo_name = str(config['clusterName']) + '_hadoop' +repo_name_value = config['configurations']['ranger-hdfs-security']['ranger.plugin.hdfs.service.name'] +if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value hadoop_security_authentication = config['configurations']['core-site']['hadoop.security.authentication'] hadoop_security_authorization = config['configurations']['core-site']['hadoop.security.authorization'] http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py index e9436c1..0ac0608 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py @@ -637,6 +637,9 @@ xa_audit_db_name = default('/configurations/admin-properties/audit_db_name', 'ra xa_audit_db_user = default('/configurations/admin-properties/audit_db_user', 'rangerlogger') xa_db_host = config['configurations']['admin-properties']['db_host'] repo_name = str(config['clusterName']) + '_hive' +repo_name_value = config['configurations']['ranger-hive-security']['ranger.plugin.hive.service.name'] +if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value jdbc_driver_class_name = config['configurations']['ranger-hive-plugin-properties']['jdbc.driverClassName'] common_name_for_certificate = config['configurations']['ranger-hive-plugin-properties']['common.name.for.certificate'] http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py index 5635fe3..df48e8b 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py @@ -187,6 +187,9 @@ if has_ranger_admin and is_supported_kafka_ranger: xa_audit_db_password = unicode(config['configurations']['admin-properties']['audit_db_password']) xa_db_host = config['configurations']['admin-properties']['db_host'] repo_name = str(config['clusterName']) + '_kafka' + repo_name_value = config['configurations']['ranger-kafka-security']['ranger.plugin.kafka.service.name'] + if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value ranger_env = config['configurations']['ranger-env'] ranger_plugin_properties = config['configurations']['ranger-kafka-plugin-properties'] http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py index 4cefbda..72e5196 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py @@ -269,6 +269,9 @@ xa_audit_db_name = default('/configurations/admin-properties/audit_db_name', 'ra xa_audit_db_user = default('/configurations/admin-properties/audit_db_user', 'rangerlogger') xa_db_host = config['configurations']['admin-properties']['db_host'] repo_name = str(config['clusterName']) + '_knox' +repo_name_value = config['configurations']['ranger-knox-security']['ranger.plugin.knox.service.name'] +if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value knox_home = config['configurations']['ranger-knox-plugin-properties']['KNOX_HOME'] common_name_for_certificate = config['configurations']['ranger-knox-plugin-properties']['common.name.for.certificate'] http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py index c20bdde..82dcb6b 100755 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py @@ -83,6 +83,9 @@ credential_provider_path = config['configurations']['dbks-site']['ranger.ks.jpa. jdbc_alias = config['configurations']['dbks-site']['ranger.ks.jpa.jdbc.credential.alias'] masterkey_alias = config['configurations']['dbks-site']['ranger.ks.masterkey.credential.alias'] repo_name = str(config['clusterName']) + '_kms' +repo_name_value = config['configurations']['ranger-kms-security']['ranger.plugin.kms.service.name'] +if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value cred_lib_path = os.path.join(kms_home,"cred","lib","*") cred_setup_prefix = (format('{kms_home}/ranger_credential_helper.py'), '-l', cred_lib_path) credential_file = format('/etc/ranger/{repo_name}/cred.jceks') http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py index 4859534..67d5769 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py @@ -239,6 +239,9 @@ xa_audit_db_name = default('/configurations/admin-properties/audit_db_name', 'ra xa_audit_db_user = default('/configurations/admin-properties/audit_db_user', 'rangerlogger') xa_db_host = config['configurations']['admin-properties']['db_host'] repo_name = str(config['clusterName']) + '_storm' +repo_name_value = config['configurations']['ranger-storm-security']['ranger.plugin.storm.service.name'] +if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value common_name_for_certificate = config['configurations']['ranger-storm-plugin-properties']['common.name.for.certificate'] http://git-wip-us.apache.org/repos/asf/ambari/blob/96518477/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py index 1347864..0496995 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py @@ -387,6 +387,9 @@ if has_ranger_admin: xa_audit_db_password = unicode(config['configurations']['admin-properties']['audit_db_password']) xa_db_host = config['configurations']['admin-properties']['db_host'] repo_name = str(config['clusterName']) + '_yarn' + repo_name_value = config['configurations']['ranger-yarn-security']['ranger.plugin.yarn.service.name'] + if not is_empty(repo_name_value) and repo_name_value != "{{repo_name}}": + repo_name = repo_name_value ranger_env = config['configurations']['ranger-env'] ranger_plugin_properties = config['configurations']['ranger-yarn-plugin-properties']