You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2015/04/16 13:32:24 UTC
incubator-ranger git commit: RANGER-402 : Create JAVA_BIN path from
JAVA_HOME
Repository: incubator-ranger
Updated Branches:
refs/heads/master 113227618 -> 9d2cbfb41
RANGER-402 : Create JAVA_BIN path from JAVA_HOME
Signed-off-by: sneethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/9d2cbfb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/9d2cbfb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/9d2cbfb4
Branch: refs/heads/master
Commit: 9d2cbfb41ccfed54026589d224d1d012f47d1ae6
Parents: 1132276
Author: Gautam Borad <gb...@gmail.com>
Authored: Thu Apr 16 16:55:55 2015 +0530
Committer: sneethiraj <sn...@apache.org>
Committed: Thu Apr 16 07:30:43 2015 -0400
----------------------------------------------------------------------
kms/scripts/db_setup.py | 19 +++++++++++++++++--
kms/scripts/dba_script.py | 29 ++++++++++++++++++++++-------
security-admin/scripts/db_setup.py | 17 ++++++++++++++++-
security-admin/scripts/dba_script.py | 17 ++++++++++++++++-
4 files changed, 71 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9d2cbfb4/kms/scripts/db_setup.py
----------------------------------------------------------------------
diff --git a/kms/scripts/db_setup.py b/kms/scripts/db_setup.py
index f9a14e0..afb2ed6 100644
--- a/kms/scripts/db_setup.py
+++ b/kms/scripts/db_setup.py
@@ -406,7 +406,22 @@ def main(argv):
FORMAT = '%(asctime)-15s %(message)s'
logging.basicConfig(format=FORMAT, level=logging.DEBUG)
- JAVA_BIN = globalDict['JAVA_BIN']
+ if os.environ['JAVA_HOME'] == "":
+ log("[E] ---------- JAVA_HOME environment property not defined, aborting installation. ----------", "error")
+ sys.exit(1)
+ else:
+ JAVA_BIN=os.path.join(os.environ['JAVA_HOME'],'bin','java')
+ if os_name == "WINDOWS" :
+ JAVA_BIN = JAVA_BIN+'.exe'
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ JAVA_BIN=globalDict['JAVA_BIN']
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ log("[E] ---------- JAVA Not Found, aborting installation. ----------", "error")
+ sys.exit(1)
XA_DB_FLAVOR = globalDict['DB_FLAVOR']
XA_DB_FLAVOR = XA_DB_FLAVOR.upper()
@@ -430,7 +445,7 @@ def main(argv):
db_password = globalDict['db_password']
x_db_version = 'x_db_version_h'
- x_user = 'x_portal_user'
+ x_user = 'ranger_masterkey'
if XA_DB_FLAVOR == "MYSQL":
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9d2cbfb4/kms/scripts/dba_script.py
----------------------------------------------------------------------
diff --git a/kms/scripts/dba_script.py b/kms/scripts/dba_script.py
index a69eea7..c3b126a 100644
--- a/kms/scripts/dba_script.py
+++ b/kms/scripts/dba_script.py
@@ -191,7 +191,7 @@ class MysqlConf(BaseDB):
query = get_cmd + " -query \"create user '%s'@'%s';\" -c ;" %(db_user, host)
ret = subprocess.call(query)
if ret == 0:
- if self.verify_user(root_user, db_root_password, host, db_user, get_cmd):
+ if self.verify_user(root_user, db_root_password, host, db_user, get_cmd,dryMode):
log("[I] MySQL user " + db_user +" created for host " + host ,"info")
else:
log("[E] Creating MySQL user " + db_user +" failed..","error")
@@ -926,7 +926,22 @@ def main(argv):
log("[I] Running DBA setup script. QuiteMode:" + str(quiteMode),"info")
if (quiteMode):
- JAVA_BIN=globalDict['JAVA_BIN']
+ if os.environ['JAVA_HOME'] == "":
+ log("[E] ---------- JAVA_HOME environment property not defined, aborting installation. ----------", "error")
+ sys.exit(1)
+ else:
+ JAVA_BIN=os.path.join(os.environ['JAVA_HOME'],'bin','java')
+ if os_name == "WINDOWS" :
+ JAVA_BIN = JAVA_BIN+'.exe'
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ JAVA_BIN=globalDict['JAVA_BIN']
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ log("[E] ---------- JAVA Not Found, aborting installation. ----------", "error")
+ sys.exit(1)
else:
if os.environ['JAVA_HOME'] == "":
log("[E] ---------- JAVA_HOME environment property not defined, aborting installation. ----------", "error")
@@ -1064,12 +1079,12 @@ def main(argv):
xa_sqlObj.grant_xa_db_user(xa_db_root_user, db_name, db_user, db_password, xa_db_root_password, is_revoke,dryMode)
logFile("===============================================\n")
if (dryMode==False):
- log("[I] ---------- Creating Ranger Admin db user ---------- ","info")
+ log("[I] ---------- Creating Ranger KMS db user ---------- ","info")
xa_sqlObj.create_rangerdb_user(xa_db_root_user, db_user, db_password, xa_db_root_password,dryMode)
- log("[I] ---------- Creating Ranger Admin database ----------","info")
+ log("[I] ---------- Creating Ranger KMS database ----------","info")
xa_sqlObj.create_db(xa_db_root_user, xa_db_root_password, db_name, db_user, db_password,dryMode)
- log("[I] ---------- Granting permission to Ranger Admin db user ----------","info")
+ log("[I] ---------- Granting permission to Ranger KMS db user ----------","info")
xa_sqlObj.grant_xa_db_user(xa_db_root_user, db_name, db_user, db_password, xa_db_root_password, is_revoke,dryMode)
- # Ranger Admin DB Host AND Ranger Audit DB Host are Different OR Same
- log("[I] ---------- Ranger Policy Manager DB and User Creation Process Completed.. ---------- ","info")
+ # Ranger KMS DB Host AND Ranger Audit DB Host are Different OR Same
+ log("[I] ---------- Ranger KMS DB and User Creation Process Completed.. ---------- ","info")
main(sys.argv)
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9d2cbfb4/security-admin/scripts/db_setup.py
----------------------------------------------------------------------
diff --git a/security-admin/scripts/db_setup.py b/security-admin/scripts/db_setup.py
index 0b63bbb..6492855 100644
--- a/security-admin/scripts/db_setup.py
+++ b/security-admin/scripts/db_setup.py
@@ -961,7 +961,22 @@ def main(argv):
FORMAT = '%(asctime)-15s %(message)s'
logging.basicConfig(format=FORMAT, level=logging.DEBUG)
- JAVA_BIN=globalDict['JAVA_BIN']
+ if os.environ['JAVA_HOME'] == "":
+ log("[E] ---------- JAVA_HOME environment property not defined, aborting installation. ----------", "error")
+ sys.exit(1)
+ else:
+ JAVA_BIN=os.path.join(os.environ['JAVA_HOME'],'bin','java')
+ if os_name == "WINDOWS" :
+ JAVA_BIN = JAVA_BIN+'.exe'
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ JAVA_BIN=globalDict['JAVA_BIN']
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ log("[E] ---------- JAVA Not Found, aborting installation. ----------", "error")
+ sys.exit(1)
XA_DB_FLAVOR=globalDict['DB_FLAVOR']
AUDIT_DB_FLAVOR=globalDict['DB_FLAVOR']
XA_DB_FLAVOR = XA_DB_FLAVOR.upper()
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9d2cbfb4/security-admin/scripts/dba_script.py
----------------------------------------------------------------------
diff --git a/security-admin/scripts/dba_script.py b/security-admin/scripts/dba_script.py
index c4cba5b..d099c9e 100644
--- a/security-admin/scripts/dba_script.py
+++ b/security-admin/scripts/dba_script.py
@@ -1114,7 +1114,22 @@ def main(argv):
log("[I] Running DBA setup script. QuiteMode:" + str(quiteMode),"info")
if (quiteMode):
- JAVA_BIN=globalDict['JAVA_BIN']
+ if os.environ['JAVA_HOME'] == "":
+ log("[E] ---------- JAVA_HOME environment property not defined, aborting installation. ----------", "error")
+ sys.exit(1)
+ else:
+ JAVA_BIN=os.path.join(os.environ['JAVA_HOME'],'bin','java')
+ if os_name == "WINDOWS" :
+ JAVA_BIN = JAVA_BIN+'.exe'
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ JAVA_BIN=globalDict['JAVA_BIN']
+ if os.path.isfile(JAVA_BIN):
+ pass
+ else:
+ log("[E] ---------- JAVA Not Found, aborting installation. ----------", "error")
+ sys.exit(1)
else:
if os.environ['JAVA_HOME'] == "":
log("[E] ---------- JAVA_HOME environment property not defined, aborting installation. ----------", "error")