This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch branch-3.0-perf
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-3.0-perf by this push:
new c432dde AMBARI-22706. Ranger installation fails (aonishuk)
c432dde is described below
commit c432dde8c20977709d729655cf562dfb898ae760
Author: Andrew Onishuk <[email protected]>
AuthorDate: Thu Jan 11 18:38:33 2018 +0200
AMBARI-22706. Ranger installation fails (aonishuk)
---
.../libraries/functions/setup_ranger_plugin_xml.py | 20 +--
.../DRUID/0.10.1/package/scripts/params.py | 2 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 20 +--
.../HIVE/2.1.0.3.0/package/scripts/params_linux.py | 20 +--
.../4.0.0.2.0/package/scripts/params_linux.py | 18 +--
.../4.2.0.3.0/package/scripts/params_linux.py | 18 +--
.../RANGER/0.4.0/package/scripts/params.py | 20 +--
.../RANGER/1.0.0.3.0/package/scripts/params.py | 20 +--
.../RANGER_KMS/0.5.0.2.3/package/scripts/params.py | 40 ++---
.../RANGER_KMS/1.0.0.3.0/package/scripts/params.py | 40 ++---
.../1.4.4.2.0/package/scripts/params_linux.py | 20 +--
.../1.4.4.3.0/package/scripts/params_linux.py | 20 +--
.../resources/custom_actions/scripts/check_host.py | 10 +-
.../common-services/configs/pxf_default.json | 4 +-
.../stacks/2.2/configs/ranger-admin-default.json | 167 ++++++++++++++++---
.../stacks/2.2/configs/ranger-admin-secured.json | 167 ++++++++++++++++---
.../stacks/2.2/configs/ranger-admin-upgrade.json | 167 ++++++++++++++++---
.../2.2/configs/ranger-usersync-upgrade.json | 164 ++++++++++++++++---
.../stacks/2.5/RANGER_KMS/test_kms_server.py | 2 +-
.../stacks/2.5/configs/ranger-admin-default.json | 178 +++++++++++++++++----
.../stacks/2.5/configs/ranger-admin-secured.json | 178 +++++++++++++++++----
.../stacks/2.5/configs/ranger-kms-default.json | 4 +-
.../stacks/2.5/configs/ranger-kms-secured.json | 4 +-
.../stacks/2.6/configs/ranger-admin-default.json | 178 +++++++++++++++++----
.../stacks/2.6/configs/ranger-admin-secured.json | 178 +++++++++++++++++----
25 files changed, 1329 insertions(+), 330 deletions(-)
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
index 78692cb..e7289a2 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
@@ -256,13 +256,13 @@ def get_audit_configs(config):
xa_audit_db_name = default('/configurations/admin-properties/audit_db_name',
'ranger_audits')
if xa_audit_db_flavor == 'mysql':
- jdbc_jar_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
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 = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
colon_count = xa_db_host.count(':')
if colon_count == 2 or colon_count == 0:
audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
@@ -270,18 +270,18 @@ def get_audit_configs(config):
audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
- jdbc_jar_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_postgres_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
audit_jdbc_url =
format('jdbc:postgresql://{xa_db_host}/{xa_audit_db_name}')
jdbc_driver = "org.postgresql.Driver"
elif xa_audit_db_flavor == 'mssql':
- jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlserver://{xa_db_host};databaseName={xa_audit_db_name}')
jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
elif xa_audit_db_flavor == 'sqla':
- jdbc_jar_name = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlanywhere:database={xa_audit_db_name};host={xa_db_host}')
jdbc_driver = "sap.jdbc4.sqlanywhere.IDriver"
else: raise Fail(format("'{xa_audit_db_flavor}' db flavor not supported."))
diff --git
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
index 49f73d7..5fe262a 100644
---
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
@@ -111,7 +111,7 @@ metadata_storage_type =
config['configurations']['druid-common']['druid.metadata
metadata_storage_url =
config['configurations']['druid-common']['druid.metadata.storage.connector.connectURI']
jdk_location = config['ambariLevelParams']['jdk_location']
if 'mysql' == metadata_storage_type:
- jdbc_driver_jar = default("/hostLevelParams/custom_mysql_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
connector_curl_source = format("{jdk_location}/{jdbc_driver_jar}")
connector_download_dir=format("{druid_extensions_dir}/mysql-metadata-storage")
downloaded_custom_connector = format("{tmp_dir}/{jdbc_driver_jar}")
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 2125a0c..b36c3cd 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
@@ -276,20 +276,20 @@ default_connectors_map = {
"com.microsoft.sqlserver.jdbc.SQLServerDriver":"sqljd
sqla_db_used = False
hive_previous_jdbc_jar_name = None
if hive_jdbc_driver == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
- jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
elif hive_jdbc_driver == "com.mysql.jdbc.Driver":
- jdbc_jar_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
elif hive_jdbc_driver == "org.postgresql.Driver":
- jdbc_jar_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
elif hive_jdbc_driver == "oracle.jdbc.driver.OracleDriver":
- jdbc_jar_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
elif hive_jdbc_driver == "sap.jdbc4.sqlanywhere.IDriver":
- jdbc_jar_name = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
sqla_db_used = True
else: raise Fail(format("JDBC driver '{hive_jdbc_driver}' not supported."))
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
index b1ab4cf..6bcb3ae 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
@@ -271,20 +271,20 @@ default_connectors_map = {
"com.microsoft.sqlserver.jdbc.SQLServerDriver":"sqljd
sqla_db_used = False
hive_previous_jdbc_jar_name = None
if hive_jdbc_driver == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
- jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
elif hive_jdbc_driver == "com.mysql.jdbc.Driver":
- jdbc_jar_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
elif hive_jdbc_driver == "org.postgresql.Driver":
- jdbc_jar_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
elif hive_jdbc_driver == "oracle.jdbc.driver.OracleDriver":
- jdbc_jar_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
elif hive_jdbc_driver == "sap.jdbc4.sqlanywhere.IDriver":
- jdbc_jar_name = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- hive_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ hive_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
sqla_db_used = True
else: raise Fail(format("JDBC driver '{hive_jdbc_driver}' not supported."))
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index afc2ef2..31e87a9 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -288,27 +288,27 @@ jdbc_driver_name =
default("/configurations/oozie-site/oozie.service.JPAService.
sqla_db_used = False
previous_jdbc_jar_name = None
if jdbc_driver_name == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
- jdbc_driver_jar = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
elif jdbc_driver_name == "com.mysql.jdbc.Driver":
- jdbc_driver_jar = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
elif jdbc_driver_name == "org.postgresql.Driver":
jdbc_driver_jar =
format("{oozie_home}/libserver/postgresql-9.0-801.jdbc4.jar") #oozie using
it's own postgres jdbc
previous_jdbc_jar_name = None
elif jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
- jdbc_driver_jar = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
elif jdbc_driver_name == "sap.jdbc4.sqlanywhere.IDriver":
- jdbc_driver_jar = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
sqla_db_used = True
else:
jdbc_driver_jar = ""
jdbc_symlink_name = ""
previous_jdbc_jar_name = None
-default("/hostLevelParams/custom_sqlanywhere_jdbc_name", None)
+default("/ambariLevelParams/custom_sqlanywhere_jdbc_name", None)
driver_curl_source = format("{jdk_location}/{jdbc_driver_jar}")
downloaded_custom_connector = format("{tmp_dir}/{jdbc_driver_jar}")
if jdbc_driver_name == "org.postgresql.Driver":
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/params_linux.py
index a05aad5..c4d5925 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.3.0/package/scripts/params_linux.py
@@ -270,27 +270,27 @@ jdbc_driver_name =
default("/configurations/oozie-site/oozie.service.JPAService.
sqla_db_used = False
previous_jdbc_jar_name = None
if jdbc_driver_name == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
- jdbc_driver_jar = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
elif jdbc_driver_name == "com.mysql.jdbc.Driver":
- jdbc_driver_jar = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
elif jdbc_driver_name == "org.postgresql.Driver":
jdbc_driver_jar =
format("{oozie_home}/libserver/postgresql-9.0-801.jdbc4.jar") #oozie using
it's own postgres jdbc
previous_jdbc_jar_name = None
elif jdbc_driver_name == "oracle.jdbc.driver.OracleDriver":
- jdbc_driver_jar = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
elif jdbc_driver_name == "sap.jdbc4.sqlanywhere.IDriver":
- jdbc_driver_jar = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_driver_jar = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
sqla_db_used = True
else:
jdbc_driver_jar = ""
jdbc_symlink_name = ""
previous_jdbc_jar_name = None
-default("/hostLevelParams/custom_sqlanywhere_jdbc_name", None)
+default("/ambariLevelParams/custom_sqlanywhere_jdbc_name", None)
driver_curl_source = format("{jdk_location}/{jdbc_driver_jar}")
downloaded_custom_connector = format("{tmp_dir}/{jdbc_driver_jar}")
if jdbc_driver_name == "org.postgresql.Driver":
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 75247eb..410ebe0 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
@@ -172,13 +172,13 @@ java_share_dir = '/usr/share/java'
jdbc_jar_name = None
previous_jdbc_jar_name = None
if db_flavor.lower() == 'mysql':
- jdbc_jar_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
audit_jdbc_url = format('jdbc:mysql://{db_host}/{ranger_auditdb_name}') if
stack_supports_ranger_audit_db else None
jdbc_dialect = "org.eclipse.persistence.platform.database.MySQLPlatform"
elif db_flavor.lower() == 'oracle':
- jdbc_jar_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
jdbc_dialect = "org.eclipse.persistence.platform.database.OraclePlatform"
colon_count = db_host.count(':')
if colon_count == 2 or colon_count == 0:
@@ -186,18 +186,18 @@ elif db_flavor.lower() == 'oracle':
else:
audit_jdbc_url = format('jdbc:oracle:thin:@//{db_host}') if
stack_supports_ranger_audit_db else None
elif db_flavor.lower() == 'postgres':
- jdbc_jar_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
audit_jdbc_url = format('jdbc:postgresql://{db_host}/{ranger_auditdb_name}')
if stack_supports_ranger_audit_db else None
jdbc_dialect = "org.eclipse.persistence.platform.database.PostgreSQLPlatform"
elif db_flavor.lower() == 'mssql':
- jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlserver://{db_host};databaseName={ranger_auditdb_name}') if
stack_supports_ranger_audit_db else None
jdbc_dialect = "org.eclipse.persistence.platform.database.SQLServerPlatform"
elif db_flavor.lower() == 'sqla':
- jdbc_jar_name = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlanywhere:database={ranger_auditdb_name};host={db_host}') if
stack_supports_ranger_audit_db else None
jdbc_dialect =
"org.eclipse.persistence.platform.database.SQLAnywherePlatform"
else: raise Fail(format("'{db_flavor}' db flavor not supported."))
diff --git
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py
index 48a567c..4ff3f7a 100644
---
a/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/RANGER/1.0.0.3.0/package/scripts/params.py
@@ -170,13 +170,13 @@ java_share_dir = '/usr/share/java'
jdbc_jar_name = None
previous_jdbc_jar_name = None
if db_flavor.lower() == 'mysql':
- jdbc_jar_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
audit_jdbc_url = format('jdbc:mysql://{db_host}/{ranger_auditdb_name}') if
stack_supports_ranger_audit_db else None
jdbc_dialect = "org.eclipse.persistence.platform.database.MySQLPlatform"
elif db_flavor.lower() == 'oracle':
- jdbc_jar_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
jdbc_dialect = "org.eclipse.persistence.platform.database.OraclePlatform"
colon_count = db_host.count(':')
if colon_count == 2 or colon_count == 0:
@@ -184,18 +184,18 @@ elif db_flavor.lower() == 'oracle':
else:
audit_jdbc_url = format('jdbc:oracle:thin:@//{db_host}') if
stack_supports_ranger_audit_db else None
elif db_flavor.lower() == 'postgres':
- jdbc_jar_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
audit_jdbc_url = format('jdbc:postgresql://{db_host}/{ranger_auditdb_name}')
if stack_supports_ranger_audit_db else None
jdbc_dialect = "org.eclipse.persistence.platform.database.PostgreSQLPlatform"
elif db_flavor.lower() == 'mssql':
- jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlserver://{db_host};databaseName={ranger_auditdb_name}') if
stack_supports_ranger_audit_db else None
jdbc_dialect = "org.eclipse.persistence.platform.database.SQLServerPlatform"
elif db_flavor.lower() == 'sqla':
- jdbc_jar_name = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlanywhere:database={ranger_auditdb_name};host={db_host}') if
stack_supports_ranger_audit_db else None
jdbc_dialect =
"org.eclipse.persistence.platform.database.SQLAnywherePlatform"
else: raise Fail(format("'{db_flavor}' db flavor not supported."))
diff --git
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
index f398be0..5ccfb0d 100755
---
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/params.py
@@ -131,14 +131,14 @@ java_share_dir = '/usr/share/java'
jdbc_jar_name = None
previous_jdbc_jar_name = None
if db_flavor == 'mysql':
- jdbc_jar_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
db_jdbc_url = format('jdbc:log4jdbc:mysql://{db_host}/{db_name}')
db_jdbc_driver = "com.mysql.jdbc.Driver"
jdbc_dialect = "org.eclipse.persistence.platform.database.MySQLPlatform"
elif db_flavor == 'oracle':
- jdbc_jar_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
colon_count = db_host.count(':')
if colon_count == 2 or colon_count == 0:
db_jdbc_url = format('jdbc:oracle:thin:@{db_host}')
@@ -147,20 +147,20 @@ elif db_flavor == 'oracle':
db_jdbc_driver = "oracle.jdbc.OracleDriver"
jdbc_dialect = "org.eclipse.persistence.platform.database.OraclePlatform"
elif db_flavor == 'postgres':
- jdbc_jar_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
db_jdbc_url = format('jdbc:postgresql://{db_host}/{db_name}')
db_jdbc_driver = "org.postgresql.Driver"
jdbc_dialect = "org.eclipse.persistence.platform.database.PostgreSQLPlatform"
elif db_flavor == 'mssql':
- jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
db_jdbc_url = format('jdbc:sqlserver://{db_host};databaseName={db_name}')
db_jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
jdbc_dialect = "org.eclipse.persistence.platform.database.SQLServerPlatform"
elif db_flavor == 'sqla':
- jdbc_jar_name = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
db_jdbc_url = format('jdbc:sqlanywhere:database={db_name};host={db_host}')
db_jdbc_driver = "sap.jdbc4.sqlanywhere.IDriver"
jdbc_dialect =
"org.eclipse.persistence.platform.database.SQLAnywherePlatform"
@@ -184,13 +184,13 @@ if has_ranger_admin:
xa_previous_jdbc_jar_name = None
if stack_supports_ranger_audit_db:
if xa_audit_db_flavor == 'mysql':
- jdbc_jar = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
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 = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
colon_count = xa_db_host.count(':')
if colon_count == 2 or colon_count == 0:
audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
@@ -198,18 +198,18 @@ if has_ranger_admin:
audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
- jdbc_jar = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
audit_jdbc_url =
format('jdbc:postgresql://{xa_db_host}/{xa_audit_db_name}')
jdbc_driver = "org.postgresql.Driver"
elif xa_audit_db_flavor == 'mssql':
- jdbc_jar = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlserver://{xa_db_host};databaseName={xa_audit_db_name}')
jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
elif xa_audit_db_flavor == 'sqla':
- jdbc_jar = default("/hostLevelParams/custom_sqlanywhere_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlanywhere:database={xa_audit_db_name};host={xa_db_host}')
jdbc_driver = "sap.jdbc4.sqlanywhere.IDriver"
else: raise Fail(format("'{xa_audit_db_flavor}' db flavor not supported."))
diff --git
a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py
index 78e9d72..9cdb5c8 100755
---
a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/package/scripts/params.py
@@ -130,14 +130,14 @@ java_share_dir = '/usr/share/java'
jdbc_jar_name = None
previous_jdbc_jar_name = None
if db_flavor == 'mysql':
- jdbc_jar_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
db_jdbc_url = format('jdbc:log4jdbc:mysql://{db_host}/{db_name}')
db_jdbc_driver = "com.mysql.jdbc.Driver"
jdbc_dialect = "org.eclipse.persistence.platform.database.MySQLPlatform"
elif db_flavor == 'oracle':
- jdbc_jar_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
colon_count = db_host.count(':')
if colon_count == 2 or colon_count == 0:
db_jdbc_url = format('jdbc:oracle:thin:@{db_host}')
@@ -146,20 +146,20 @@ elif db_flavor == 'oracle':
db_jdbc_driver = "oracle.jdbc.OracleDriver"
jdbc_dialect = "org.eclipse.persistence.platform.database.OraclePlatform"
elif db_flavor == 'postgres':
- jdbc_jar_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
db_jdbc_url = format('jdbc:postgresql://{db_host}/{db_name}')
db_jdbc_driver = "org.postgresql.Driver"
jdbc_dialect = "org.eclipse.persistence.platform.database.PostgreSQLPlatform"
elif db_flavor == 'mssql':
- jdbc_jar_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
db_jdbc_url = format('jdbc:sqlserver://{db_host};databaseName={db_name}')
db_jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
jdbc_dialect = "org.eclipse.persistence.platform.database.SQLServerPlatform"
elif db_flavor == 'sqla':
- jdbc_jar_name = default("/hostLevelParams/custom_sqlanywhere_jdbc_name",
None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar_name = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
db_jdbc_url = format('jdbc:sqlanywhere:database={db_name};host={db_host}')
db_jdbc_driver = "sap.jdbc4.sqlanywhere.IDriver"
jdbc_dialect =
"org.eclipse.persistence.platform.database.SQLAnywherePlatform"
@@ -183,13 +183,13 @@ if has_ranger_admin:
xa_previous_jdbc_jar_name = None
if stack_supports_ranger_audit_db:
if xa_audit_db_flavor == 'mysql':
- jdbc_jar = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
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 = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
colon_count = xa_db_host.count(':')
if colon_count == 2 or colon_count == 0:
audit_jdbc_url = format('jdbc:oracle:thin:@{xa_db_host}')
@@ -197,18 +197,18 @@ if has_ranger_admin:
audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = "oracle.jdbc.OracleDriver"
elif xa_audit_db_flavor == 'postgres':
- jdbc_jar = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_postgres_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
audit_jdbc_url =
format('jdbc:postgresql://{xa_db_host}/{xa_audit_db_name}')
jdbc_driver = "org.postgresql.Driver"
elif xa_audit_db_flavor == 'mssql':
- jdbc_jar = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlserver://{xa_db_host};databaseName={xa_audit_db_name}')
jdbc_driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
elif xa_audit_db_flavor == 'sqla':
- jdbc_jar = default("/hostLevelParams/custom_sqlanywhere_jdbc_name", None)
- xa_previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
+ jdbc_jar = default("/ambariLevelParams/custom_sqlanywhere_jdbc_name",
None)
+ xa_previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_sqlanywhere_jdbc_name", None)
audit_jdbc_url =
format('jdbc:sqlanywhere:database={xa_audit_db_name};host={xa_db_host}')
jdbc_driver = "sap.jdbc4.sqlanywhere.IDriver"
else: raise Fail(format("'{xa_audit_db_flavor}' db flavor not supported."))
diff --git
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params_linux.py
index f0554a2..4c8082b 100644
---
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params_linux.py
@@ -99,24 +99,24 @@ if "jdbc_drivers" in config['configurations']['sqoop-env']:
driver_name = driver_name.strip()
if driver_name and not driver_name == '':
if driver_name == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
- jdbc_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
jdbc_driver_name = "mssql"
elif driver_name == "com.mysql.jdbc.Driver":
- jdbc_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
jdbc_driver_name = "mysql"
elif driver_name == "org.postgresql.Driver":
- jdbc_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_postgres_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
jdbc_driver_name = "postgres"
elif driver_name == "oracle.jdbc.driver.OracleDriver":
- jdbc_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
jdbc_driver_name = "oracle"
elif driver_name == "org.hsqldb.jdbc.JDBCDriver":
- jdbc_name = default("/hostLevelParams/custom_hsqldb_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_hsqldb_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_hsqldb_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_hsqldb_jdbc_name", None)
jdbc_driver_name = "hsqldb"
else: raise Fail(format("JDBC driver '{driver_name}' not supported."))
else:
diff --git
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py
index 5f0d349..b61aeba 100644
---
a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.3.0/package/scripts/params_linux.py
@@ -99,24 +99,24 @@ if "jdbc_drivers" in config['configurations']['sqoop-env']:
driver_name = driver_name.strip()
if driver_name and not driver_name == '':
if driver_name == "com.microsoft.sqlserver.jdbc.SQLServerDriver":
- jdbc_name = default("/hostLevelParams/custom_mssql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mssql_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_mssql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mssql_jdbc_name", None)
jdbc_driver_name = "mssql"
elif driver_name == "com.mysql.jdbc.Driver":
- jdbc_name = default("/hostLevelParams/custom_mysql_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_mysql_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_mysql_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_mysql_jdbc_name", None)
jdbc_driver_name = "mysql"
elif driver_name == "org.postgresql.Driver":
- jdbc_name = default("/hostLevelParams/custom_postgres_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_postgres_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_postgres_jdbc_name",
None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_postgres_jdbc_name", None)
jdbc_driver_name = "postgres"
elif driver_name == "oracle.jdbc.driver.OracleDriver":
- jdbc_name = default("/hostLevelParams/custom_oracle_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_oracle_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_oracle_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_oracle_jdbc_name", None)
jdbc_driver_name = "oracle"
elif driver_name == "org.hsqldb.jdbc.JDBCDriver":
- jdbc_name = default("/hostLevelParams/custom_hsqldb_jdbc_name", None)
- previous_jdbc_jar_name =
default("/hostLevelParams/previous_custom_hsqldb_jdbc_name", None)
+ jdbc_name = default("/ambariLevelParams/custom_hsqldb_jdbc_name", None)
+ previous_jdbc_jar_name =
default("/ambariLevelParams/previous_custom_hsqldb_jdbc_name", None)
jdbc_driver_name = "hsqldb"
else: raise Fail(format("JDBC driver '{driver_name}' not supported."))
else:
diff --git
a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index e610307..d86e7a0 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -280,7 +280,7 @@ class CheckHost(Script):
no_jdbc_error_message = None
if db_name == DB_MYSQL:
- jdbc_driver_mysql_name =
default("/hostLevelParams/custom_mysql_jdbc_name", None)
+ jdbc_driver_mysql_name =
default("/ambariLevelParams/custom_mysql_jdbc_name", None)
if not jdbc_driver_mysql_name:
no_jdbc_error_message = "The MySQL JDBC driver has not been set.
Please ensure that you have executed 'ambari-server setup --jdbc-db=mysql
--jdbc-driver=/path/to/jdbc_driver'."
else:
@@ -288,7 +288,7 @@ class CheckHost(Script):
jdbc_driver_class = JDBC_DRIVER_CLASS_MYSQL
jdbc_name = jdbc_driver_mysql_name
elif db_name == DB_ORACLE:
- jdbc_driver_oracle_name =
default("/hostLevelParams/custom_oracle_jdbc_name", None)
+ jdbc_driver_oracle_name =
default("/ambariLevelParams/custom_oracle_jdbc_name", None)
if not jdbc_driver_oracle_name:
no_jdbc_error_message = "The Oracle JDBC driver has not been set.
Please ensure that you have executed 'ambari-server setup --jdbc-db=oracle
--jdbc-driver=/path/to/jdbc_driver'."
else:
@@ -296,7 +296,7 @@ class CheckHost(Script):
jdbc_driver_class = JDBC_DRIVER_CLASS_ORACLE
jdbc_name = jdbc_driver_oracle_name
elif db_name == DB_POSTGRESQL:
- jdbc_driver_postgres_name =
default("/hostLevelParams/custom_postgres_jdbc_name", None)
+ jdbc_driver_postgres_name =
default("/ambariLevelParams/custom_postgres_jdbc_name", None)
if not jdbc_driver_postgres_name:
no_jdbc_error_message = "The Postgres JDBC driver has not been set.
Please ensure that you have executed 'ambari-server setup --jdbc-db=postgres
--jdbc-driver=/path/to/jdbc_driver'."
else:
@@ -304,7 +304,7 @@ class CheckHost(Script):
jdbc_driver_class = JDBC_DRIVER_CLASS_POSTGRESQL
jdbc_name = jdbc_driver_postgres_name
elif db_name == DB_MSSQL:
- jdbc_driver_mssql_name =
default("/hostLevelParams/custom_mssql_jdbc_name", None)
+ jdbc_driver_mssql_name =
default("/ambariLevelParams/custom_mssql_jdbc_name", None)
if not jdbc_driver_mssql_name:
no_jdbc_error_message = "The MSSQL JDBC driver has not been set.
Please ensure that you have executed 'ambari-server setup --jdbc-db=mssql
--jdbc-driver=/path/to/jdbc_driver'."
else:
@@ -312,7 +312,7 @@ class CheckHost(Script):
jdbc_driver_class = JDBC_DRIVER_CLASS_MSSQL
jdbc_name = jdbc_driver_mssql_name
elif db_name == DB_SQLA:
- jdbc_driver_sqla_name =
default("/hostLevelParams/custom_sqlanywhere_jdbc_name", None)
+ jdbc_driver_sqla_name =
default("/ambariLevelParams/custom_sqlanywhere_jdbc_name", None)
if not jdbc_driver_sqla_name:
no_jdbc_error_message = "The SQLAnywhere JDBC driver has not been set.
Please ensure that you have executed 'ambari-server setup --jdbc-db=sqlanywhere
--jdbc-driver=/path/to/jdbc_driver'."
else:
diff --git
a/ambari-server/src/test/python/common-services/configs/pxf_default.json
b/ambari-server/src/test/python/common-services/configs/pxf_default.json
index 512d589..da86cbd 100644
--- a/ambari-server/src/test/python/common-services/configs/pxf_default.json
+++ b/ambari-server/src/test/python/common-services/configs/pxf_default.json
@@ -28,7 +28,9 @@
"ambari_db_rca_username": "mapred",
"jdk_name": "jdk-7u45-linux-x64.tar.gz",
"java_home": "/usr/jdk64/jdk1.7.0_45",
- "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
+ "custom_mysql_jdbc_name": "mysql-connector-java.jar",
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
},
"repositoryFile": {
"resolved": true,
diff --git
a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json
b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json
index 0caa72b..0e894e4 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-default.json
@@ -2,25 +2,156 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.2",
"not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
- "ambari_db_rca_password": "mapred",
- "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.2",
- "stack_name": "HDP",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
- "ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari",
- "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
- "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
- "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar",
- "custom_mssql_jdbc_name" : "mssql-jdbc-driver.jar",
- "custom_sqlanywhere_jdbc_name" : "sqla-client-jdbc.tar.gz"
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
+ "custom_mysql_jdbc_name": "mysql-connector-java.jar",
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
diff --git
a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json
b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json
index 01e4652..154ed82 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-secured.json
@@ -2,25 +2,156 @@
"roleCommand": "SERVICE_CHECK",
"clusterName": "c1",
"hostname": "c6401.ambari.apache.org",
- "hostLevelParams": {
+ "clusterLevelParams": {
+ "stack_version": "2.2",
"not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
- "ambari_db_rca_password": "mapred",
- "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "stack_version": "2.2",
- "stack_name": "HDP",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
- "ambari_db_rca_username": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "java_version": "8",
- "db_name": "ambari",
- "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
- "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
- "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar",
- "custom_mssql_jdbc_name" : "mssql-jdbc-driver.jar",
- "custom_sqlanywhere_jdbc_name" : "sqla-client-jdbc.tar.gz"
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
+ "custom_mysql_jdbc_name": "mysql-connector-java.jar",
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
diff --git
a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
index c12207d..e669b90 100644
--- a/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
+++ b/ambari-server/src/test/python/stacks/2.2/configs/ranger-admin-upgrade.json
@@ -55,33 +55,156 @@
"kerberosCommandParams": [],
"clusterName": "c1",
"hostname": "c6408.ambari.apache.org",
- "hostLevelParams": {
- "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "jdk_location": "http://c6407.ambari.apache.org:8080/resources/";,
- "ambari_db_rca_password": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_67",
- "java_version": "8",
- "ambari_db_rca_url":
"jdbc:postgresql://c6407.ambari.apache.org/ambarirca",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "custom_command": "RESTART",
- "oracle_jdbc_url":
"http://c6407.ambari.apache.org:8080/resources//ojdbc6.jar";,
- "repo_info":
"[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2398\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2442\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\
[...]
- "group_list": "[\"hadoop\",\"users\",\"ranger\",\"spark\"]",
- "agentCacheDir": "/var/lib/ambari-agent/cache",
+ "clusterLevelParams": {
"stack_version": "2.2",
+ "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+ "hooks_folder": "stack-hooks",
"stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
"db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
"ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
- "db_driver_filename": "mysql-connector-java.jar",
- "user_list":
"[\"root\",\"ambari-qa\",\"hdfs\",\"ranger\",\"spark\",\"mapred\",\"tez\",\"zookeeper\",\"rangerlogger\",\"kafka\",\"yarn\",\"ams\",\"rangeradmin\"]",
- "mysql_jdbc_url":
"http://c6407.ambari.apache.org:8080/resources//mysql-connector-java.jar";,
- "custom_mysql_jdbc_name" : "mysql-connector-java.jar",
- "custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
- "custom_postgres_jdbc_name" : "test-postgres-jdbc.jar",
- "custom_mssql_jdbc_name" : "mssql-jdbc-driver.jar",
- "custom_sqlanywhere_jdbc_name" : "sqla-client-jdbc.tar.gz"
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
+ "custom_mysql_jdbc_name": "mysql-connector-java.jar",
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {
diff --git
a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
index 16a85c2..8f0d136 100644
---
a/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
+++
b/ambari-server/src/test/python/stacks/2.2/configs/ranger-usersync-upgrade.json
@@ -55,29 +55,157 @@
"kerberosCommandParams": [],
"clusterName": "c1",
"hostname": "c6408.ambari.apache.org",
- "hostLevelParams": {
- "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
- "jdk_location": "http://c6407.ambari.apache.org:8080/resources/";,
- "ambari_db_rca_password": "mapred",
- "java_home": "/usr/jdk64/jdk1.7.0_67",
- "java_version": "8",
- "ambari_db_rca_url":
"jdbc:postgresql://c6407.ambari.apache.org/ambarirca",
- "jce_name": "UnlimitedJCEPolicyJDK7.zip",
- "custom_command": "RESTART",
- "oracle_jdbc_url":
"http://c6407.ambari.apache.org:8080/resources//ojdbc6.jar";,
- "repo_info":
"[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2398\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.2\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.2.2.0-2442\",\"baseSaved\":true},{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/centos6\",\"osType\
[...]
- "group_list": "[\"hadoop\",\"users\",\"ranger\",\"spark\"]",
- "agentCacheDir": "/var/lib/ambari-agent/cache",
+ "clusterLevelParams": {
"stack_version": "2.2",
+ "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+ "hooks_folder": "stack-hooks",
"stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
"db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
"ambari_db_rca_driver": "org.postgresql.Driver",
- "jdk_name": "jdk-7u67-linux-x64.tar.gz",
"ambari_db_rca_username": "mapred",
- "db_driver_filename": "mysql-connector-java.jar",
- "user_list":
"[\"root\",\"ambari-qa\",\"hdfs\",\"ranger\",\"spark\",\"mapred\",\"tez\",\"zookeeper\",\"rangerlogger\",\"kafka\",\"yarn\",\"ams\",\"rangeradmin\"]",
- "mysql_jdbc_url":
"http://c6407.ambari.apache.org:8080/resources//mysql-connector-java.jar";
- },
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_67",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
+ "custom_mysql_jdbc_name": "mysql-connector-java.jar",
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
+ },
"commandType": "EXECUTION_COMMAND",
"roleParams": {
"component_category": "MASTER"
diff --git
a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
index fca5a1b..a1161ae 100644
--- a/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
+++ b/ambari-server/src/test/python/stacks/2.5/RANGER_KMS/test_kms_server.py
@@ -159,7 +159,7 @@ class TestRangerKMS(RMFTestCase):
group = 'kms',
mode = 0640
)
-
+
self.assertResourceCalled('HdfsResource', '/ranger/audit',
type = 'directory',
action = ['create_on_execute'],
diff --git
a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json
b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json
index 48c1527..1c32f28 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-default.json
@@ -159,36 +159,156 @@
}
},
"roleCommand": "START",
- "hostLevelParams": {
- "agent_stack_retry_on_unavailability": "false",
- "stack_name": "HDP",
- "package_version": "2_5_0_0_*",
+ "clusterLevelParams": {
+ "stack_version": "2.5",
+ "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
"custom_mysql_jdbc_name": "mysql-connector-java.jar",
- "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
- "host_sys_prepped": "false",
- "ambari_db_rca_username": "mapred",
- "mysql_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar";,
- "agent_stack_retry_count": "5",
- "stack_version": "2.5",
- "jdk_name": "jdk-8u60-linux-x64.tar.gz",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "repository_version_id": "1",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
- "not_managed_hdfs_path_list": "[\"/tmp\"]",
- "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "java_version": "8",
- "repo_info":
"[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-801\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.5\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.5.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-801\",\"baseSaved\":true},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.21/repos/ce
[...]
- "package_list":
"[{\"name\":\"ranger_${stack_version}-admin\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-usersync\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-tagsync\",\"condition\":\"should_install_ranger_tagsync\",\"skipUpgrade\":false},{\"name\":\"ambari-logsearch-solr-client\",\"condition\":\"should_install_logsearch_solr_client\",\"skipUpgrade\":false}]",
- "db_name": "ambari",
- "group_list": "[\"ranger\",\"hadoop\",\"users\"]",
- "agentCacheDir": "/var/lib/ambari-agent/cache",
- "ambari_db_rca_password": "mapred",
- "jce_name": "jce_policy-8.zip",
- "oracle_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";,
- "db_driver_filename": "mysql-connector-java.jar",
- "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
- "clientsToUpdateConfigs": "[\"*\"]"
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandParams": {
"service_package_folder": "common-services/RANGER/0.4.0/package",
diff --git
a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json
b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json
index 4f1de56..473dc93 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-admin-secured.json
@@ -168,36 +168,156 @@
}
},
"roleCommand": "START",
- "hostLevelParams": {
- "agent_stack_retry_on_unavailability": "false",
- "stack_name": "HDP",
- "package_version": "2_5_0_0_*",
+ "clusterLevelParams": {
+ "stack_version": "2.5",
+ "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
"custom_mysql_jdbc_name": "mysql-connector-java.jar",
- "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
- "host_sys_prepped": "false",
- "ambari_db_rca_username": "mapred",
- "mysql_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar";,
- "agent_stack_retry_count": "5",
- "stack_version": "2.5",
- "jdk_name": "jdk-8u60-linux-x64.tar.gz",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "repository_version_id": "1",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
- "not_managed_hdfs_path_list": "[\"/tmp\"]",
- "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "java_version": "8",
- "repo_info":
"[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-801\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.5\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.5.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.5.0.0-801\",\"baseSaved\":true},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.21/repos/ce
[...]
- "package_list":
"[{\"name\":\"ranger_${stack_version}-admin\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-usersync\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-tagsync\",\"condition\":\"should_install_ranger_tagsync\",\"skipUpgrade\":false},{\"name\":\"ambari-logsearch-solr-client\",\"condition\":\"should_install_logsearch_solr_client\",\"skipUpgrade\":false}]",
- "db_name": "ambari",
- "group_list": "[\"ranger\",\"hadoop\",\"users\"]",
- "agentCacheDir": "/var/lib/ambari-agent/cache",
- "ambari_db_rca_password": "mapred",
- "jce_name": "jce_policy-8.zip",
- "oracle_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";,
- "db_driver_filename": "mysql-connector-java.jar",
- "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
- "clientsToUpdateConfigs": "[\"*\"]"
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandParams": {
"service_package_folder": "common-services/RANGER/0.4.0/package",
diff --git
a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json
b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json
index 7779858..84263fc 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-default.json
@@ -207,7 +207,9 @@
"ambari_db_rca_username": "mapred",
"jdk_name": "jdk-7u45-linux-x64.tar.gz",
"java_home": "/usr/jdk64/jdk1.7.0_45",
- "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
+ "custom_mysql_jdbc_name": "mysql-connector-java.jar",
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
},
"repositoryFile": {
"resolved": true,
diff --git
a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
index f013d46..70c3f6a 100644
--- a/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
+++ b/ambari-server/src/test/python/stacks/2.5/configs/ranger-kms-secured.json
@@ -216,7 +216,9 @@
"ambari_db_rca_username": "mapred",
"jdk_name": "jdk-7u45-linux-x64.tar.gz",
"java_home": "/usr/jdk64/jdk1.7.0_45",
- "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
+ "custom_mysql_jdbc_name": "mysql-connector-java.jar",
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
},
"repositoryFile": {
"resolved": true,
diff --git
a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json
b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json
index 065937e..1206118 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-default.json
@@ -167,36 +167,156 @@
}
},
"roleCommand": "START",
- "hostLevelParams": {
- "agent_stack_retry_on_unavailability": "false",
- "stack_name": "HDP",
- "package_version": "2_6_0_0_*",
+ "clusterLevelParams": {
+ "stack_version": "2.6",
+ "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
"custom_mysql_jdbc_name": "mysql-connector-java.jar",
- "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
- "host_sys_prepped": "false",
- "ambari_db_rca_username": "mapred",
- "mysql_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar";,
- "agent_stack_retry_count": "5",
- "stack_version": "2.6",
- "jdk_name": "jdk-8u60-linux-x64.tar.gz",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "repository_version_id": "1",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
- "not_managed_hdfs_path_list": "[\"/tmp\"]",
- "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "java_version": "8",
- "repo_info":
"[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.0.0-801\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.0.0-801\",\"baseSaved\":true},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.21/repos/ce
[...]
- "package_list":
"[{\"name\":\"ranger_${stack_version}-admin\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-usersync\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-tagsync\",\"condition\":\"should_install_ranger_tagsync\",\"skipUpgrade\":false},{\"name\":\"ambari-logsearch-solr-client\",\"condition\":\"should_install_logsearch_solr_client\",\"skipUpgrade\":false}]",
- "db_name": "ambari",
- "group_list": "[\"ranger\",\"hadoop\",\"users\"]",
- "agentCacheDir": "/var/lib/ambari-agent/cache",
- "ambari_db_rca_password": "mapred",
- "jce_name": "jce_policy-8.zip",
- "oracle_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";,
- "db_driver_filename": "mysql-connector-java.jar",
- "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
- "clientsToUpdateConfigs": "[\"*\"]"
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandParams": {
"service_package_folder": "common-services/RANGER/0.4.0/package",
diff --git
a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json
b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json
index ec4f042..f2017a6 100644
--- a/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json
+++ b/ambari-server/src/test/python/stacks/2.6/configs/ranger-admin-secured.json
@@ -176,36 +176,156 @@
}
},
"roleCommand": "START",
- "hostLevelParams": {
- "agent_stack_retry_on_unavailability": "false",
- "stack_name": "HDP",
- "package_version": "2_6_0_0_*",
+ "clusterLevelParams": {
+ "stack_version": "2.6",
+ "not_managed_hdfs_path_list":
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+ "hooks_folder": "stack-hooks",
+ "stack_name": "HDP",
+ "group_list": "[\"hdfs\",\"hadoop\",\"users\"]",
+ "user_groups": "{\"hive\":[\"hadoop\"],
\"oozie\":[\"hadoop\",\"users\"], \"nobody\":[\"hadoop\",\"nobody\"],
\"ambari-qa\":[\"hadoop\",\"users\"], \"flume\":[\"hadoop\"],
\"hdfs\":[\"hadoop\"], \"storm\":[\"hadoop\"], \"mapred\":[\"hadoop\"],
\"hbase\":[\"hadoop\"], \"tez\":[\"hadoop\",\"users\"],
\"zookeeper\":[\"hadoop\"], \"falcon\":[\"hadoop\",\"users\"],
\"sqoop\":[\"hadoop\"], \"yarn\":[\"hadoop\"], \"hcat\":[\"hadoop\"]}",
+ "cluster_name": "c1",
+ "user_list": "[\"ambari-qa\",\"hdfs\"]"
+ },
+ "ambariLevelParams": {
+ "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+ "agent_stack_retry_count": "5",
+ "db_driver_filename": "mysql-connector-java.jar",
+ "agent_stack_retry_on_unavailability": "false",
+ "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+ "jce_name": "jce_policy-7.zip",
+ "java_version": "7",
+ "ambari_db_rca_password": "mapred",
+ "host_sys_prepped": "false",
+ "db_name": "ambari",
+ "oracle_jdbc_url":
"http://c6401.ambari.apache.org/resources//ojdbc6.jar";,
+ "ambari_db_rca_driver": "org.postgresql.Driver",
+ "ambari_db_rca_username": "mapred",
+ "jdk_name": "jdk-7u45-linux-x64.tar.gz",
+ "java_home": "/usr/jdk64/jdk1.7.0_45",
+ "mysql_jdbc_url":
"http://c6401.ambari.apache.org/resources//mysql-connector-java.jar";,
"custom_mysql_jdbc_name": "mysql-connector-java.jar",
- "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar",
- "host_sys_prepped": "false",
- "ambari_db_rca_username": "mapred",
- "mysql_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar";,
- "agent_stack_retry_count": "5",
- "stack_version": "2.6",
- "jdk_name": "jdk-8u60-linux-x64.tar.gz",
- "ambari_db_rca_driver": "org.postgresql.Driver",
- "java_home": "/usr/jdk64/jdk1.7.0_45",
- "repository_version_id": "1",
- "jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
- "not_managed_hdfs_path_list": "[\"/tmp\"]",
- "ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
- "java_version": "8",
- "repo_info":
"[{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.0.0-801\",\"osType\":\"redhat6\",\"repoId\":\"HDP-2.6\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/updates/2.6.0.0\",\"latestBaseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.0.0-801\",\"baseSaved\":true},{\"baseUrl\":\"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.21/repos/ce
[...]
- "package_list":
"[{\"name\":\"ranger_${stack_version}-admin\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-usersync\",\"condition\":\"\",\"skipUpgrade\":false},{\"name\":\"ranger_${stack_version}-tagsync\",\"condition\":\"should_install_ranger_tagsync\",\"skipUpgrade\":false},{\"name\":\"ambari-logsearch-solr-client\",\"condition\":\"should_install_logsearch_solr_client\",\"skipUpgrade\":false}]",
- "db_name": "ambari",
- "group_list": "[\"ranger\",\"hadoop\",\"users\"]",
- "agentCacheDir": "/var/lib/ambari-agent/cache",
- "ambari_db_rca_password": "mapred",
- "jce_name": "jce_policy-8.zip",
- "oracle_jdbc_url":
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar";,
- "db_driver_filename": "mysql-connector-java.jar",
- "user_list": "[\"zookeeper\",\"ambari-qa\",\"ranger\",\"hdfs\"]",
- "clientsToUpdateConfigs": "[\"*\"]"
+ "previous_custom_mysql_jdbc_name": "mysql-connector-java-old.jar"
+ },
+ "repositoryFile": {
+ "resolved": true,
+ "repoVersion": "2.6.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ },
+ "agentLevelParams": {
+ "public_hostname": "c6401.ambari.apache.org",
+ "hostname": "c6401.ambari.apache.org",
+ "agentConfigParams": {
+ "agent": {
+ "parallel_execution": 0,
+ "use_system_proxy_settings": true
+ }
+ },
+ "agentCacheDir": "/var/lib/ambari-agent/cache"
+ },
+ "hostLevelParams": {
+ "recoveryConfig": {
+ "retryGap": "5",
+ "windowInMinutes": "60",
+ "maxLifetimeCount": "1024",
+ "components": "",
+ "maxCount": "6",
+ "type": "AUTO_START"
+ },
+ "hostRepositories": {
+ "componentRepos": {
+ "NAMENODE": 1,
+ "SECONDARY_NAMENODE": 1,
+ "DATANODE": 1,
+ "HDFS_CLIENT": 1
+ },
+ "commandRepos": {
+ "1": {
+ "resolved": true,
+ "repoVersion": "2.1.4.0-60",
+ "repositories": [
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-GPL/centos6/2.x/BUILDS/2.6.4.0-60";,
+ "repoName": "HDP-GPL",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-2.6-GPL-repo-1"
+ },
+ {
+ "mirrorsList": null,
+ "ambariManaged": true,
+ "baseUrl":
"http://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.22/repos/centos6";,
+ "repoName": "HDP-UTILS",
+ "components": null,
+ "osType": "redhat6",
+ "distribution": null,
+ "repoId": "HDP-UTILS-1.1.0.22-repo-1"
+ }
+ ],
+ "feature": {
+ "m_isScoped": true,
+ "m_isPreInstalled": false
+ },
+ "stackName": "HDP",
+ "repoVersionId": 1
+ }
+ }
+ }
+ },
+ "serviceLevelParams": {
+ "credentialStoreEnabled": false,
+ "status_commands_timeout": 300,
+ "version": "2.7.3",
+ "service_package_folder": "common-services/HDFS/2.1.0.2.0/package"
},
"commandParams": {
"service_package_folder": "common-services/RANGER/0.4.0/package",
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
