You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/05/20 00:05:19 UTC
ambari git commit: AMBARI-11215. Fix jdbc url path for Ranger Admin
and Ranger plugins (Gautam Borad via alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 1b7afa940 -> 7290fa0c2
AMBARI-11215. Fix jdbc url path for Ranger Admin and Ranger plugins (Gautam Borad via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7290fa0c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7290fa0c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7290fa0c
Branch: refs/heads/trunk
Commit: 7290fa0c2a6a11a2e3fac13e7834eead89b9e854
Parents: 1b7afa9
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Tue May 19 14:52:41 2015 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Tue May 19 15:05:15 2015 -0700
----------------------------------------------------------------------
.../0.96.0.2.0/package/scripts/params_linux.py | 8 +++
.../package/scripts/setup_ranger_hbase.py | 2 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 8 +++
.../package/scripts/setup_ranger_hdfs.py | 2 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 8 +++
.../package/scripts/setup_ranger_hive.py | 2 +-
.../0.5.0.2.2/package/scripts/params_linux.py | 8 +++
.../package/scripts/setup_ranger_knox.py | 2 +-
.../RANGER/0.4.0/package/scripts/params.py | 26 ++++++++--
.../0.9.1.2.1/package/scripts/params_linux.py | 8 +++
.../package/scripts/setup_ranger_storm.py | 2 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 8 +++
.../package/scripts/setup_ranger_yarn.py | 2 +-
.../HBASE/configuration/ranger-hbase-audit.xml | 6 +--
.../ranger-hbase-policymgr-ssl.xml | 4 +-
.../HDFS/configuration/ranger-hdfs-audit.xml | 6 +--
.../configuration/ranger-hdfs-policymgr-ssl.xml | 4 +-
.../HIVE/configuration/ranger-hive-audit.xml | 6 +--
.../configuration/ranger-hive-policymgr-ssl.xml | 4 +-
.../KNOX/configuration/ranger-knox-audit.xml | 6 +--
.../configuration/ranger-knox-policymgr-ssl.xml | 4 +-
.../RANGER/configuration/ranger-admin-site.xml | 20 ++++++--
.../RANGER/configuration/ranger-site.xml | 21 +++-----
.../configuration/usersync-properties.xml | 51 +++++++-------------
.../STORM/configuration/ranger-storm-audit.xml | 6 +--
.../ranger-storm-policymgr-ssl.xml | 4 +-
.../YARN/configuration/ranger-yarn-audit.xml | 6 +--
.../configuration/ranger-yarn-policymgr-ssl.xml | 4 +-
28 files changed, 145 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/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 500d1ec..410a690 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
@@ -225,15 +225,23 @@ if has_ranger_admin:
if 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 == '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 == '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 == '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("{exec_tmp_dir}/{jdbc_jar_name}")
driver_curl_source = format("{jdk_location}/{jdbc_symlink_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
index 88a6686..86049f8 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
@@ -40,7 +40,7 @@ def setup_ranger_hbase():
plugin_audit_properties=params.config['configurations']['ranger-hbase-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-hbase-audit'],
plugin_security_properties=params.config['configurations']['ranger-hbase-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-hbase-security'],
plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hbase-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-hbase-policymgr-ssl'],
- component_list=['hbase-client', 'hbase-master', 'hbase-regionserver'], audit_db_is_enabled=params.xa_audit_db_password,
+ component_list=['hbase-client', 'hbase-master', 'hbase-regionserver'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/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 9cc2831..3f1fb0d 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
@@ -373,15 +373,23 @@ if has_ranger_admin:
if 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 == '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 == '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 == '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}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py
index 4226e51..f7ddbed 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/setup_ranger_hdfs.py
@@ -40,7 +40,7 @@ def setup_ranger_hdfs():
plugin_audit_properties=params.config['configurations']['ranger-hdfs-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-hdfs-audit'],
plugin_security_properties=params.config['configurations']['ranger-hdfs-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-hdfs-security'],
plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hdfs-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-hdfs-policymgr-ssl'],
- component_list=['hadoop-client'], audit_db_is_enabled=params.xa_audit_db_password,
+ component_list=['hadoop-client'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/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 4396401..11b439b 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
@@ -416,15 +416,23 @@ if has_ranger_admin:
if xa_audit_db_flavor and xa_audit_db_flavor == 'mysql':
ranger_jdbc_symlink_name = "mysql-jdbc-driver.jar"
ranger_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':
ranger_jdbc_jar_name = "ojdbc6.jar"
ranger_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':
ranger_jdbc_jar_name = "postgresql.jar"
ranger_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':
ranger_jdbc_jar_name = "sqljdbc4.jar"
ranger_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"
ranger_downloaded_custom_connector = format("{tmp_dir}/{ranger_jdbc_jar_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_ranger_hive.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_ranger_hive.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_ranger_hive.py
index 12c2894..ac7f473 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_ranger_hive.py
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/setup_ranger_hive.py
@@ -40,7 +40,7 @@ def setup_ranger_hive():
plugin_audit_properties=params.config['configurations']['ranger-hive-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-hive-audit'],
plugin_security_properties=params.config['configurations']['ranger-hive-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-hive-security'],
plugin_policymgr_ssl_properties=params.config['configurations']['ranger-hive-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-hive-policymgr-ssl'],
- component_list=['hive-client', 'hive-metastore', 'hive-server2'], audit_db_is_enabled=params.xa_audit_db_password,
+ component_list=['hive-client', 'hive-metastore', 'hive-server2'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/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 99c6b48..af312b1 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
@@ -188,15 +188,23 @@ if has_ranger_admin:
if 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 == '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 == '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 == '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}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
index ee818b6..2db23a0 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/setup_ranger_knox.py
@@ -40,7 +40,7 @@ def setup_ranger_knox():
plugin_audit_properties=params.config['configurations']['ranger-knox-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-knox-audit'],
plugin_security_properties=params.config['configurations']['ranger-knox-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-knox-security'],
plugin_policymgr_ssl_properties=params.config['configurations']['ranger-knox-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-knox-policymgr-ssl'],
- component_list=['knox-server'], audit_db_is_enabled=params.xa_audit_db_password,
+ component_list=['knox-server'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index 8a241da..f73a839 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -88,18 +88,34 @@ oracle_home = default("/configurations/ranger-env/oracle_home", "-")
#For curl command in ranger to get db connector
jdk_location = config['hostLevelParams']['jdk_location']
java_share_dir = '/usr/share/java'
-if db_flavor and db_flavor.lower() == 'mysql':
+if db_flavor.lower() == 'mysql':
jdbc_symlink_name = "mysql-jdbc-driver.jar"
jdbc_jar_name = "mysql-connector-java.jar"
-elif db_flavor and db_flavor.lower() == 'oracle':
+ db_jdbc_url = format('jdbc:log4jdbc:mysql://{db_host}/{ranger_db_name}')
+ audit_jdbc_url = format('jdbc:log4jdbc:mysql://{db_host}/{ranger_auditdb_name}')
+ jdbc_driver = "net.sf.log4jdbc.DriverSpy"
+ jdbc_dialect = "org.eclipse.persistence.platform.database.MySQLPlatform"
+elif db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
-elif db_flavor and db_flavor.lower() == 'postgres':
+ db_jdbc_url = format('jdbc:oracle:thin:\@//{db_host}')
+ audit_jdbc_url = format('jdbc:oracle:thin:\@//{db_host}')
+ jdbc_driver = "oracle.jdbc.OracleDriver"
+ jdbc_dialect = "org.eclipse.persistence.platform.database.OraclePlatform"
+elif db_flavor.lower() == 'postgres':
jdbc_jar_name = "postgresql.jar"
jdbc_symlink_name = "postgres-jdbc-driver.jar"
-elif db_flavor and db_flavor.lower() == 'sqlserver':
+ db_jdbc_url = format('jdbc:postgresql://{db_host}/{ranger_db_name}')
+ audit_jdbc_url = format('jdbc:postgresql://{db_host}/{ranger_auditdb_name}')
+ jdbc_driver = "org.postgresql.Driver"
+ jdbc_dialect = "org.eclipse.persistence.platform.database.PostgreSQLPlatform"
+elif db_flavor.lower() == 'sqlserver':
jdbc_jar_name = "sqljdbc4.jar"
jdbc_symlink_name = "mssql-jdbc-driver.jar"
+ db_jdbc_url = format('jdbc:sqlserver://{db_host};databaseName={ranger_db_name}')
+ audit_jdbc_url = format('jdbc:sqlserver://{db_host};databaseName={ranger_auditdb_name}')
+ jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
+ jdbc_dialect = "org.eclipse.persistence.platform.database.SQLServerPlatform"
downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}")
@@ -123,8 +139,8 @@ ugsync_jceks_path = config["configurations"]["ranger-ugsync-site"]["ranger.users
cred_lib_path = os.path.join(ranger_home,"cred","lib","*")
cred_setup_prefix = format('python {ranger_home}/ranger_credential_helper.py -l "{cred_lib_path}"')
ranger_audit_source_type = config["configurations"]["ranger-admin-site"]["ranger.audit.source.type"]
+
if xml_configurations_supported:
ranger_usersync_keystore_password = unicode(config["configurations"]["ranger-ugsync-site"]["ranger.usersync.keystore.password"])
ranger_usersync_ldap_ldapbindpassword = unicode(config["configurations"]["ranger-ugsync-site"]["ranger.usersync.ldap.ldapbindpassword"])
ranger_usersync_truststore_password = unicode(config["configurations"]["ranger-ugsync-site"]["ranger.usersync.truststore.password"])
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
index cc639ba..508262f 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
@@ -173,15 +173,23 @@ if has_ranger_admin:
if 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 == '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 == '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 == '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}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/setup_ranger_storm.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/setup_ranger_storm.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/setup_ranger_storm.py
index 2d2c9c1..3c69b6b 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/setup_ranger_storm.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/setup_ranger_storm.py
@@ -40,7 +40,7 @@ def setup_ranger_storm():
plugin_audit_properties=params.config['configurations']['ranger-storm-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-storm-audit'],
plugin_security_properties=params.config['configurations']['ranger-storm-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-storm-security'],
plugin_policymgr_ssl_properties=params.config['configurations']['ranger-storm-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-storm-policymgr-ssl'],
- component_list=['storm-client', 'storm-nimbus'], audit_db_is_enabled=params.xa_audit_db_password,
+ component_list=['storm-client', 'storm-nimbus'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/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 faac4ed..da7b9b4 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
@@ -309,15 +309,23 @@ if has_ranger_admin:
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}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/setup_ranger_yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/setup_ranger_yarn.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/setup_ranger_yarn.py
index 4d53180..c8b12df 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/setup_ranger_yarn.py
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/setup_ranger_yarn.py
@@ -35,7 +35,7 @@ def setup_ranger_yarn():
plugin_audit_properties=params.config['configurations']['ranger-yarn-audit'], plugin_audit_attributes=params.config['configuration_attributes']['ranger-yarn-audit'],
plugin_security_properties=params.config['configurations']['ranger-yarn-security'], plugin_security_attributes=params.config['configuration_attributes']['ranger-yarn-security'],
plugin_policymgr_ssl_properties=params.config['configurations']['ranger-yarn-policymgr-ssl'], plugin_policymgr_ssl_attributes=params.config['configuration_attributes']['ranger-yarn-policymgr-ssl'],
- component_list=['hadoop-yarn-resourcemanager'], audit_db_is_enabled=params.xa_audit_db_password,
+ component_list=['hadoop-yarn-resourcemanager'], audit_db_is_enabled=params.xa_audit_db_is_enabled,
credential_file=params.credential_file, xa_audit_db_password=params.xa_audit_db_password,
ssl_truststore_password=params.ssl_truststore_password, ssl_keystore_password=params.ssl_keystore_password,
api_version = 'v2'
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
index d3b2248..adb53fe 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-audit.xml
@@ -59,7 +59,7 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
- <value>jdbc:{{xa_audit_db_flavor}}://{{xa_db_host}}/{{xa_audit_db_name}}</value>
+ <value>{{audit_jdbc_url}}</value>
<description></description>
</property>
@@ -77,13 +77,13 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
- <value>com.mysql.jdbc.Driver</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
index 5a32119..43d5050 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/configuration/ranger-hbase-policymgr-ssl.xml
@@ -46,13 +46,13 @@
<property>
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java keystore credential file</description>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java truststore credential file</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
index 82e59b3..66dab3d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-audit.xml
@@ -59,7 +59,7 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
- <value>jdbc:{{xa_audit_db_flavor}}://{{xa_db_host}}/{{xa_audit_db_name}}</value>
+ <value>{{audit_jdbc_url}}</value>
<description></description>
</property>
@@ -77,13 +77,13 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
- <value>com.mysql.jdbc.Driver</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
index bb64bb7..0c57c23 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HDFS/configuration/ranger-hdfs-policymgr-ssl.xml
@@ -46,13 +46,13 @@
<property>
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java keystore credential file</description>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java truststore credential file</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
index 5a34de9..aabfe31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-audit.xml
@@ -59,7 +59,7 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
- <value>jdbc:{{xa_audit_db_flavor}}://{{xa_db_host}}/{{xa_audit_db_name}}</value>
+ <value>{{audit_jdbc_url}}</value>
<description></description>
</property>
@@ -77,13 +77,13 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
- <value>com.mysql.jdbc.Driver</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
index 0c6eaec..12c4c51 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/ranger-hive-policymgr-ssl.xml
@@ -46,13 +46,13 @@
<property>
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java keystore credential file</description>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java truststore credential file</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
index 7248fdd..1878c40 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-audit.xml
@@ -59,7 +59,7 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
- <value>jdbc:{{xa_audit_db_flavor}}://{{xa_db_host}}/{{xa_audit_db_name}}</value>
+ <value>{{audit_jdbc_url}}</value>
<description></description>
</property>
@@ -77,13 +77,13 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
- <value>com.mysql.jdbc.Driver</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
index 98c5637..d95f95d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/KNOX/configuration/ranger-knox-policymgr-ssl.xml
@@ -46,13 +46,13 @@
<property>
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java keystore credential file</description>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java truststore credential file</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
index 8de5b06..dd4451e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml
@@ -80,13 +80,13 @@
<property>
<name>ranger.jpa.jdbc.driver</name>
- <value>net.sf.log4jdbc.DriverSpy</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>ranger.jpa.jdbc.url</name>
- <value>jdbc:log4jdbc:{{db_flavor}}://{{db_host}}/{{ranger_db_name}}</value>
+ <value>{{db_jdbc_url}}</value>
<description></description>
</property>
@@ -177,13 +177,13 @@
<property>
<name>ranger.jpa.audit.jdbc.driver</name>
- <value>net.sf.log4jdbc.DriverSpy</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>ranger.jpa.audit.jdbc.url</name>
- <value>jdbc:log4jdbc:{{db_flavor}}://{{db_host}}/{{ranger_auditdb_name}}</value>
+ <value>{{audit_jdbc_url}}</value>
<description></description>
</property>
@@ -224,4 +224,16 @@
<description></description>
</property>
+ <property>
+ <name>ranger.jpa.jdbc.dialect</name>
+ <value>{{jdbc_dialect}}</value>
+ <description></description>
+ </property>
+
+ <property>
+ <name>ranger.jpa.audit.jdbc.dialect</name>
+ <value>{{jdbc_dialect}}</value>
+ <description></description>
+ </property>
+
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-site.xml
index 950d3eb..e5a1f8f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-site.xml
@@ -23,44 +23,37 @@
<property>
<name>http.service.port</name>
- <value>6080</value>
- <description>The http port to be used</description>
+ <deleted>true</deleted>
</property>
<property>
<name>https.service.port</name>
- <value>6182</value>
- <description>The secured https port to be used</description>
+ <deleted>true</deleted>
</property>
<property>
<name>https.attrib.keystoreFile</name>
- <value>/etc/ranger/admin/keys/server.jks</value>
- <description>The keystore file location</description>
+ <deleted>true</deleted>
</property>
<property>
<name>https.attrib.keystorePass</name>
- <value>ranger</value>
- <description>The keystore pass to be used </description>
+ <deleted>true</deleted>
</property>
<property>
<name>https.attrib.keyAlias</name>
- <value>myKey</value>
- <description>The key alias to be used </description>
+ <deleted>true</deleted>
</property>
<property>
<name>https.attrib.clientAuth</name>
- <value>want</value>
- <description>The client auth to be used </description>
+ <deleted>true</deleted>
</property>
<property>
<name>http.enabled</name>
- <value>true</value>
- <description>http enabled or https enabled </description>
+ <deleted>true</deleted>
</property>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/usersync-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/usersync-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/usersync-properties.xml
index 6196f89..43e18c6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/usersync-properties.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/usersync-properties.xml
@@ -22,87 +22,70 @@
<configuration supports_final="false" supports_do_not_extend="true">
<property>
<name>SYNC_SOURCE</name>
- <value>unix</value>
- <description></description>
+ <deleted>true</deleted>
</property>
<property>
<name>MIN_UNIX_USER_ID_TO_SYNC</name>
- <value>1000</value>
- <description></description>
+ <deleted>true</deleted>
</property>
<property>
<name>POLICY_MGR_URL</name>
- <value>{{usersync_exturl}}</value>
- <description>Policy Manager external url</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_INTERVAL</name>
- <value>1</value>
- <description></description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_URL</name>
- <value>ldap://localhost:389</value>
- <description>a sample value would be: ldap://ldap.example.com:389</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_BIND_DN</name>
- <value>cn=admin,dc=xasecure,dc=net</value>
- <description>a sample value would be cn=admin,ou=users,dc=hadoop,dc=apache,dc-org</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_BIND_PASSWORD</name>
- <value>admin321</value>
- <description></description>
+ <deleted>true</deleted>
</property>
<property>
<name>CRED_KEYSTORE_FILENAME</name>
- <value>/usr/lib/xausersync/.jceks/xausersync.jceks</value>
- <description></description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_BASE</name>
- <value>ou=users,dc=xasecure,dc=net</value>
- <description>sample value would be ou=users,dc=hadoop,dc=apache,dc=org</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_SCOPE</name>
- <value>sub</value>
- <description>default value: sub</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_USER_OBJECT_CLASS</name>
- <value>person</value>
- <description>default value: person</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_USER_SEARCH_FILTER</name>
- <value>-</value>
- <description>default value is empty</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_USER_NAME_ATTRIBUTE</name>
- <value>cn</value>
- <description>default value: cn</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_USER_GROUP_NAME_ATTRIBUTE</name>
- <value>memberof,ismemberof</value>
- <description></description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_USERNAME_CASE_CONVERSION</name>
- <value>lower</value>
- <description>possible values: none, lower, upper</description>
+ <deleted>true</deleted>
</property>
<property>
<name>SYNC_LDAP_GROUPNAME_CASE_CONVERSION</name>
- <value>lower</value>
- <description>possible values: none, lower, upper</description>
+ <deleted>true</deleted>
</property>
<property>
<name>logdir</name>
- <value>logs</value>
- <description>user sync log path</description>
+ <deleted>true</deleted>
</property>
</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
index bb7fc43..43870e6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-audit.xml
@@ -59,7 +59,7 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
- <value>jdbc:{{xa_audit_db_flavor}}://{{xa_db_host}}/{{xa_audit_db_name}}</value>
+ <value>{{audit_jdbc_url}}</value>
<description></description>
</property>
@@ -77,13 +77,13 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
- <value>com.mysql.jdbc.Driver</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
index 6e4a10c..f7decfc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/STORM/configuration/ranger-storm-policymgr-ssl.xml
@@ -46,13 +46,13 @@
<property>
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java keystore credential file</description>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java truststore credential file</description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
index 3895e13..25eddd4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-audit.xml
@@ -59,7 +59,7 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.url</name>
- <value>jdbc:{{xa_audit_db_flavor}}://{{xa_db_host}}/{{xa_audit_db_name}}</value>
+ <value>{{audit_jdbc_url}}</value>
<description></description>
</property>
@@ -77,13 +77,13 @@
<property>
<name>xasecure.audit.jpa.javax.persistence.jdbc.driver</name>
- <value>com.mysql.jdbc.Driver</value>
+ <value>{{jdbc_driver}}</value>
<description></description>
</property>
<property>
<name>xasecure.audit.credential.provider.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description></description>
</property>
http://git-wip-us.apache.org/repos/asf/ambari/blob/7290fa0c/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
index 3197232..026c80b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
@@ -46,13 +46,13 @@
<property>
<name>xasecure.policymgr.clientssl.keystore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java keystore credential file</description>
</property>
<property>
<name>xasecure.policymgr.clientssl.truststore.credential.file</name>
- <value>jceks://file/{{credential_file}}</value>
+ <value>jceks://file{{credential_file}}</value>
<description>java truststore credential file</description>
</property>