Repository: ambari Updated Branches: refs/heads/trunk cf4df7e6e -> 869709914
AMBARI-11480 - Do not use ranger related configs until Ranger is installed Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86970991 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86970991 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86970991 Branch: refs/heads/trunk Commit: 869709914977e5671cf7207dc5da18fe65bf2ad7 Parents: cf4df7e Author: Artem Baranchuk <abaranc...@hortonworks.con> Authored: Thu May 28 13:31:04 2015 +0300 Committer: Artem Baranchuk <abaranc...@hortonworks.con> Committed: Thu May 28 22:25:07 2015 +0300 ---------------------------------------------------------------------- .../0.96.0.2.0/package/scripts/params_linux.py | 3 +- .../0.12.0.2.0/package/scripts/params_linux.py | 5 +- .../2.1.0.2.0/package/scripts/params_linux.py | 135 ++++++++++--------- .../package/scripts/resourcemanager.py | 2 +- 4 files changed, 73 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/86970991/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 ca8ac34..ee95493 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 @@ -226,8 +226,9 @@ policy_user = config['configurations']['ranger-hbase-plugin-properties']['policy #For curl command in ranger plugin to get db connector jdk_location = config['hostLevelParams']['jdk_location'] java_share_dir = '/usr/share/java' -enable_ranger_hbase = (config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled'].lower() == 'yes') +enable_ranger_hbase = False if has_ranger_admin: + enable_ranger_hbase = (config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled'].lower() == 'yes') xa_audit_db_password = unicode(config['configurations']['admin-properties']['audit_db_password']) repo_config_password = unicode(config['configurations']['ranger-hbase-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']) xa_audit_db_flavor = (config['configurations']['admin-properties']['DB_FLAVOR']).lower() http://git-wip-us.apache.org/repos/asf/ambari/blob/86970991/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 3ee9dc4..6e12dd0 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 @@ -393,9 +393,7 @@ HdfsResource = functools.partial( # ranger host ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", []) has_ranger_admin = not len(ranger_admin_hosts) == 0 -if Script.is_hdp_stack_greater_or_equal("2.2"): - enable_ranger_hive = (config['configurations']['ranger-hive-plugin-properties']['ranger-hive-plugin-enabled'].lower() == 'yes') -xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported'] +xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported'] #ranger hive properties policymgr_mgr_url = config['configurations']['admin-properties']['policymgr_external_url'] @@ -419,6 +417,7 @@ if security_enabled: #For curl command in ranger plugin to get db connector if has_ranger_admin: + enable_ranger_hive = (config['configurations']['ranger-hive-plugin-properties']['ranger-hive-plugin-enabled'].lower() == 'yes') repo_config_password = unicode(config['configurations']['ranger-hive-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']) xa_audit_db_flavor = (config['configurations']['admin-properties']['DB_FLAVOR']).lower() http://git-wip-us.apache.org/repos/asf/ambari/blob/86970991/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 589f7b7..d801879 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 @@ -278,72 +278,73 @@ else: namenode_hostname = config['clusterHostInfo']['namenode_host'][0] ranger_admin_log_dir = default("/configurations/ranger-env/ranger_admin_log_dir","/var/log/ranger/admin") -is_supported_yarn_ranger = config['configurations']['yarn-env']['is_supported_yarn_ranger'] #ranger yarn properties -if has_ranger_admin and is_supported_yarn_ranger: - - enable_ranger_yarn = (config['configurations']['ranger-yarn-plugin-properties']['ranger-yarn-plugin-enabled'].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']).lower() - xa_audit_db_name = config['configurations']['admin-properties']['audit_db_name'] - xa_audit_db_user = config['configurations']['admin-properties']['audit_db_user'] - 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' - - ranger_env = config['configurations']['ranger-env'] - ranger_plugin_properties = config['configurations']['ranger-yarn-plugin-properties'] - policy_user = config['configurations']['ranger-yarn-plugin-properties']['policy_user'] - - ranger_plugin_config = { - 'username' : config['configurations']['ranger-yarn-plugin-properties']['REPOSITORY_CONFIG_USERNAME'], - 'password' : unicode(config['configurations']['ranger-yarn-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']), - 'yarn.url' : config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'], - 'commonNameForCertificate' : config['configurations']['ranger-yarn-plugin-properties']['common.name.for.certificate'] - } - - yarn_ranger_plugin_repo = { - 'isEnabled': 'true', - 'configs': ranger_plugin_config, - 'description': 'yarn repo', - 'name': repo_name, - 'repositoryType': 'yarn', - 'type': 'yarn', - 'assetType': '1' - } - #For curl command in ranger plugin to get db connector - jdk_location = config['hostLevelParams']['jdk_location'] - java_share_dir = '/usr/share/java' - if xa_audit_db_flavor and xa_audit_db_flavor == 'mysql': - jdbc_symlink_name = "mysql-jdbc-driver.jar" - jdbc_jar_name = "mysql-connector-java.jar" - audit_jdbc_url = format('jdbc:mysql://{xa_db_host}/{xa_audit_db_name}') - jdbc_driver = "com.mysql.jdbc.Driver" - elif xa_audit_db_flavor and xa_audit_db_flavor == 'oracle': - jdbc_jar_name = "ojdbc6.jar" - jdbc_symlink_name = "oracle-jdbc-driver.jar" - audit_jdbc_url = format('jdbc:oracle:thin:\@//{xa_db_host}') - jdbc_driver = "oracle.jdbc.OracleDriver" - elif xa_audit_db_flavor and xa_audit_db_flavor == 'postgres': - jdbc_jar_name = "postgresql.jar" - jdbc_symlink_name = "postgres-jdbc-driver.jar" - audit_jdbc_url = format('jdbc:postgresql://{xa_db_host}/{xa_audit_db_name}') - jdbc_driver = "org.postgresql.Driver" - elif xa_audit_db_flavor and xa_audit_db_flavor == 'sqlserver': - jdbc_jar_name = "sqljdbc4.jar" - jdbc_symlink_name = "mssql-jdbc-driver.jar" - audit_jdbc_url = format('jdbc:sqlserver://{xa_db_host};databaseName={xa_audit_db_name}') - jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver" - - downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}") - - driver_curl_source = format("{jdk_location}/{jdbc_symlink_name}") - driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}") - - ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls'] - xa_audit_db_is_enabled = config['configurations']['ranger-yarn-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None - ssl_keystore_password = unicode(config['configurations']['ranger-yarn-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None - ssl_truststore_password = unicode(config['configurations']['ranger-yarn-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None - credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None +if has_ranger_admin: + is_supported_yarn_ranger = config['configurations']['yarn-env']['is_supported_yarn_ranger'] + + if is_supported_yarn_ranger: + enable_ranger_yarn = (config['configurations']['ranger-yarn-plugin-properties']['ranger-yarn-plugin-enabled'].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']).lower() + xa_audit_db_name = config['configurations']['admin-properties']['audit_db_name'] + xa_audit_db_user = config['configurations']['admin-properties']['audit_db_user'] + 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' + + ranger_env = config['configurations']['ranger-env'] + ranger_plugin_properties = config['configurations']['ranger-yarn-plugin-properties'] + policy_user = config['configurations']['ranger-yarn-plugin-properties']['policy_user'] + + ranger_plugin_config = { + 'username' : config['configurations']['ranger-yarn-plugin-properties']['REPOSITORY_CONFIG_USERNAME'], + 'password' : unicode(config['configurations']['ranger-yarn-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']), + 'yarn.url' : config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'], + 'commonNameForCertificate' : config['configurations']['ranger-yarn-plugin-properties']['common.name.for.certificate'] + } + + yarn_ranger_plugin_repo = { + 'isEnabled': 'true', + 'configs': ranger_plugin_config, + 'description': 'yarn repo', + 'name': repo_name, + 'repositoryType': 'yarn', + 'type': 'yarn', + 'assetType': '1' + } + #For curl command in ranger plugin to get db connector + jdk_location = config['hostLevelParams']['jdk_location'] + java_share_dir = '/usr/share/java' + if xa_audit_db_flavor and xa_audit_db_flavor == 'mysql': + jdbc_symlink_name = "mysql-jdbc-driver.jar" + jdbc_jar_name = "mysql-connector-java.jar" + audit_jdbc_url = format('jdbc:mysql://{xa_db_host}/{xa_audit_db_name}') + jdbc_driver = "com.mysql.jdbc.Driver" + elif xa_audit_db_flavor and xa_audit_db_flavor == 'oracle': + jdbc_jar_name = "ojdbc6.jar" + jdbc_symlink_name = "oracle-jdbc-driver.jar" + audit_jdbc_url = format('jdbc:oracle:thin:\@//{xa_db_host}') + jdbc_driver = "oracle.jdbc.OracleDriver" + elif xa_audit_db_flavor and xa_audit_db_flavor == 'postgres': + jdbc_jar_name = "postgresql.jar" + jdbc_symlink_name = "postgres-jdbc-driver.jar" + audit_jdbc_url = format('jdbc:postgresql://{xa_db_host}/{xa_audit_db_name}') + jdbc_driver = "org.postgresql.Driver" + elif xa_audit_db_flavor and xa_audit_db_flavor == 'sqlserver': + jdbc_jar_name = "sqljdbc4.jar" + jdbc_symlink_name = "mssql-jdbc-driver.jar" + audit_jdbc_url = format('jdbc:sqlserver://{xa_db_host};databaseName={xa_audit_db_name}') + jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver" + + downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}") + + driver_curl_source = format("{jdk_location}/{jdbc_symlink_name}") + driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}") + + ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls'] + xa_audit_db_is_enabled = config['configurations']['ranger-yarn-audit']['xasecure.audit.destination.db'] if xml_configurations_supported else None + ssl_keystore_password = unicode(config['configurations']['ranger-yarn-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) if xml_configurations_supported else None + ssl_truststore_password = unicode(config['configurations']['ranger-yarn-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) if xml_configurations_supported else None + credential_file = format('/etc/ranger/{repo_name}/cred.jceks') if xml_configurations_supported else None http://git-wip-us.apache.org/repos/asf/ambari/blob/86970991/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py index 4ddab8c..88a3cba 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py @@ -112,7 +112,7 @@ class ResourcemanagerDefault(Resourcemanager): env.set_params(params) self.configure(env) # FOR SECURITY - if params.is_supported_yarn_ranger: + if params.has_ranger_admin and params.is_supported_yarn_ranger: setup_ranger_yarn() #Ranger Yarn Plugin related calls if not Script.is_hdp_stack_greater_or_equal("2.2"): install_tez_jars()
