You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2015/04/16 18:09:25 UTC
ambari git commit: AMBARI-10531. Add Postgres support for
Ranger.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk eb481241a -> 40e4b807d
AMBARI-10531. Add Postgres support for Ranger.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40e4b807
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40e4b807
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40e4b807
Branch: refs/heads/trunk
Commit: 40e4b807da25e9840108ad8b3552603573e2294e
Parents: eb48124
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Apr 16 19:03:54 2015 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Apr 16 19:03:54 2015 +0300
----------------------------------------------------------------------
.../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 6 ++++++
.../HBASE/1.1.0.2.3/package/scripts/params_linux.py | 6 ++++++
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 6 ++++++
.../HIVE/0.12.0.2.0/package/scripts/params_linux.py | 6 ++++++
.../common-services/KNOX/0.5.0.2.2/package/scripts/params.py | 6 ++++++
.../common-services/RANGER/0.4.0/package/scripts/params.py | 6 ++++++
.../RANGER/0.4.0/package/scripts/setup_ranger.py | 4 ++++
.../STORM/0.9.1.2.1/package/scripts/params_linux.py | 8 +++++++-
8 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/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 f971f74..cabe713 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
@@ -239,6 +239,12 @@ if xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'mysql':
elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'postgres':
+ jdbc_jar_name = "postgresql.jar"
+ jdbc_symlink_name = "postgres-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'sqlserver':
+ jdbc_jar_name = "sqljdbc4.jar"
+ jdbc_symlink_name = "mssql-jdbc-driver.jar"
downloaded_custom_connector = format("{exec_tmp_dir}/{jdbc_jar_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/scripts/params_linux.py
index abde3f2..efca51a 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/scripts/params_linux.py
@@ -242,6 +242,12 @@ if xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'mysql':
elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'postgres':
+ jdbc_jar_name = "postgresql.jar"
+ jdbc_symlink_name = "postgres-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'sqlserver':
+ jdbc_jar_name = "sqljdbc4.jar"
+ jdbc_symlink_name = "mssql-jdbc-driver.jar"
downloaded_custom_connector = format("{exec_tmp_dir}/{jdbc_jar_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/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 2a13337..b0e100f 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
@@ -392,6 +392,12 @@ if xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'mysql':
elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'postgres':
+ jdbc_jar_name = "postgresql.jar"
+ jdbc_symlink_name = "postgres-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'sqlserver':
+ jdbc_jar_name = "sqljdbc4.jar"
+ jdbc_symlink_name = "mssql-jdbc-driver.jar"
downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/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 e5f9679..05d72c8 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
@@ -404,6 +404,12 @@ if xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'mysql':
elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'oracle':
ranger_jdbc_jar_name = "ojdbc6.jar"
ranger_jdbc_symlink_name = "oracle-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'postgres':
+ ranger_jdbc_jar_name = "postgresql.jar"
+ ranger_jdbc_symlink_name = "postgres-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'sqlserver':
+ ranger_jdbc_jar_name = "sqljdbc4.jar"
+ ranger_jdbc_symlink_name = "mssql-jdbc-driver.jar"
ranger_downloaded_custom_connector = format("{tmp_dir}/{ranger_jdbc_jar_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
index b3baf32..13b0868 100644
--- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py
@@ -197,6 +197,12 @@ if xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'mysql':
elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'postgres':
+ jdbc_jar_name = "postgresql.jar"
+ jdbc_symlink_name = "postgres-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'sqlserver':
+ jdbc_jar_name = "sqljdbc4.jar"
+ jdbc_symlink_name = "mssql-jdbc-driver.jar"
downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/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 718c3c1..9367496 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
@@ -70,6 +70,12 @@ if db_flavor and db_flavor.lower() == 'mysql':
elif db_flavor and db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
+elif db_flavor and db_flavor.lower() == 'postgres':
+ jdbc_jar_name = "postgresql.jar"
+ jdbc_symlink_name = "postgres-jdbc-driver.jar"
+elif db_flavor and db_flavor.lower() == 'sqlserver':
+ jdbc_jar_name = "sqljdbc4.jar"
+ jdbc_symlink_name = "mssql-jdbc-driver.jar"
downloaded_custom_connector = format("{tmp_dir}/{jdbc_jar_name}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py
index f54ba01..4f372c7 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py
@@ -88,6 +88,10 @@ def check_db_connnection():
cmd = format('{sql_command_invoker} -u {db_root_user} --password={db_root_password} -h {db_host} -s -e "select version();"')
elif params.db_flavor.lower() == 'oracle':
cmd = format('{sql_command_invoker} {db_root_user}/{db_root_password}@{db_host} AS SYSDBA')
+ elif params.db_flavor.lower() == 'postgres':
+ cmd_str = 'true'
+ elif params.db_flavor.lower() == 'sqlserver':
+ cmd_str = 'true'
try:
Execute(cmd)
http://git-wip-us.apache.org/repos/asf/ambari/blob/40e4b807/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 abc51d5..c989730 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
@@ -191,8 +191,14 @@ if xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'mysql':
elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'oracle':
jdbc_jar_name = "ojdbc6.jar"
jdbc_symlink_name = "oracle-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'postgres':
+ jdbc_jar_name = "postgresql.jar"
+ jdbc_symlink_name = "postgres-jdbc-driver.jar"
+elif xa_audit_db_flavor and xa_audit_db_flavor.lower() == 'sqlserver':
+ jdbc_jar_name = "sqljdbc4.jar"
+ jdbc_symlink_name = "mssql-jdbc-driver.jar"
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}")
\ No newline at end of file
+driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}")