Repository: ambari Updated Branches: refs/heads/trunk 8c92ed631 -> 8d98d9307
AMBARI-11946 Set right boolean property for Kafka (HDP 2.2) in kafka-env (Gautam Borad via jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d98d930 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d98d930 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d98d930 Branch: refs/heads/trunk Commit: 8d98d930743b78006ca11eb283fcf49450c1042a Parents: 8c92ed6 Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Tue Jun 16 11:45:33 2015 -0700 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Tue Jun 16 11:45:33 2015 -0700 ---------------------------------------------------------------------- .../common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml | 2 +- .../common-services/KAFKA/0.8.1.2.2/package/scripts/params.py | 3 ++- .../stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8d98d930/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml index 132e641..94f4975 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml @@ -65,6 +65,6 @@ fi </property> <property> <name>is_supported_kafka_ranger</name> - <value>False</value> + <value>false</value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/8d98d930/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py index 708e7cd..4783b69 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py @@ -23,6 +23,7 @@ from resource_management.libraries.functions.version import format_hdp_stack_ver from resource_management.libraries.functions.default import default from utils import get_bare_principal from resource_management.libraries.functions.get_hdp_version import get_hdp_version +from resource_management.libraries.functions.is_empty import is_empty import status_params @@ -133,7 +134,7 @@ is_supported_kafka_ranger = config['configurations']['kafka-env']['is_supported_ if has_ranger_admin and is_supported_kafka_ranger: enable_ranger_kafka = config['configurations']['ranger-kafka-plugin-properties']['ranger-kafka-plugin-enabled'] - enable_ranger_kafka = enable_ranger_kafka is not None and enable_ranger_kafka.lower() == 'yes' + enable_ranger_kafka = not is_empty(enable_ranger_kafka) and enable_ranger_kafka.lower() == 'yes' policymgr_mgr_url = config['configurations']['admin-properties']['policymgr_external_url'] sql_connector_jar = config['configurations']['admin-properties']['SQL_CONNECTOR_JAR'] xa_audit_db_flavor = config['configurations']['admin-properties']['DB_FLAVOR'] http://git-wip-us.apache.org/repos/asf/ambari/blob/8d98d930/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml index bfe2e75..eb8b78b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KAFKA/configuration/kafka-env.xml @@ -23,6 +23,6 @@ <configuration> <property> <name>is_supported_kafka_ranger</name> - <value>True</value> + <value>true</value> </property> </configuration>
