Repository: ambari Updated Branches: refs/heads/trunk 045d612ef -> 9d9958005
AMBARI-11237 : Provide option on Ranger UI for separate DBA mode (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/9d995800 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9d995800 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9d995800 Branch: refs/heads/trunk Commit: 9d99580050a3778a265e0164cb35434b46b72fc0 Parents: 045d612 Author: Jayush Luniya <[email protected]> Authored: Wed May 20 18:16:04 2015 -0700 Committer: Jayush Luniya <[email protected]> Committed: Wed May 20 18:16:04 2015 -0700 ---------------------------------------------------------------------- .../RANGER/0.4.0/package/scripts/params.py | 2 ++ .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py | 13 +++++++++---- .../2.3/services/RANGER/configuration/ranger-env.xml | 10 ++++++++-- ambari-web/app/data/HDP2.3/site_properties.js | 9 +++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9d995800/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 f73a839..9581385 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 @@ -44,6 +44,8 @@ hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported'] +create_db_dbuser = config['configurations']['ranger-env']['create_db_dbuser'] + stack_is_hdp22_or_further = Script.is_hdp_stack_greater_or_equal("2.2") stack_is_hdp23_or_further = Script.is_hdp_stack_greater_or_equal("2.3") http://git-wip-us.apache.org/repos/asf/ambari/blob/9d995800/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py index 2575676..f89cdb5 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py @@ -101,16 +101,21 @@ def setup_ranger_db(): if not os.path.isfile(os.path.join(params.ranger_home, 'ews', 'lib',params.jdbc_jar_name)): Execute(('cp', '--remove-destination', params.downloaded_custom_connector, os.path.join(params.ranger_home, 'ews', 'lib')), path=["/bin", "/usr/bin/"], - sudo=True) + sudo=True) ModifyPropertiesFile(format("{ranger_home}/install.properties"), properties = params.config['configurations']['admin-properties'] ) - dba_setup = format('python {ranger_home}/dba_script.py -q') - db_setup = format('python {ranger_home}/db_setup.py') + # User wants us to setup the DB user and DB? + if params.create_db_dbuser: + Logger.info('Setting up Ranger DB and DB User') + dba_setup = format('python {ranger_home}/dba_script.py -q') + Execute(dba_setup, environment={'RANGER_ADMIN_HOME':params.ranger_home, 'JAVA_HOME': params.java_home}, logoutput=True) + else: + Logger.info('Separate DBA property not set. Assuming Ranger DB and DB User exists!') - Execute(dba_setup, environment={'RANGER_ADMIN_HOME':params.ranger_home, 'JAVA_HOME': params.java_home}, logoutput=True) + db_setup = format('python {ranger_home}/db_setup.py') Execute(db_setup, environment={'RANGER_ADMIN_HOME':params.ranger_home, 'JAVA_HOME': params.java_home}, logoutput=True) http://git-wip-us.apache.org/repos/asf/ambari/blob/9d995800/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml index b5bb3b3..dd6270c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-env.xml @@ -27,8 +27,14 @@ </property> <property> + <name>create_db_dbuser</name> + <value>true</value> + <description>Setup Ranger Database and Database User?</description> + </property> + + <property> <name>oracle_home</name> <deleted>true</deleted> - </property> + </property> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/9d995800/ambari-web/app/data/HDP2.3/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js index 6d186c7..5a351b5 100644 --- a/ambari-web/app/data/HDP2.3/site_properties.js +++ b/ambari-web/app/data/HDP2.3/site_properties.js @@ -164,6 +164,15 @@ hdp23properties.push({ "category": "DBSettings", "index": 0 }, + { + "id": "site property", + "name": "create_db_dbuser", + "displayName": "Setup DB and DB user", + "displayType": "checkbox", + "filename": "ranger-env.xml", + "category": "Advanced ranger-env", + "serviceName": "RANGER" + }, /**************************************** RANGER - HDFS Plugin ***************************************/ { "id": "site property",
