This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 939918d5d6 AMBARI-25762: Fix CI failure on Jenkins (#3418)
939918d5d6 is described below
commit 939918d5d6ab477a5eaf04c42cbe87a055385f9b
Author: Zhiguo Wu <[email protected]>
AuthorDate: Wed Oct 19 08:19:01 2022 +0800
AMBARI-25762: Fix CI failure on Jenkins (#3418)
---
ambari-server/src/main/python/ambari_server/serverConfiguration.py | 4 +---
ambari-server/src/main/python/ambari_server/setupSecurity.py | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index f340ff67ce..5570eaa1bf 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -987,9 +987,7 @@ def store_password_file(password, filename):
return passFilePath.replace('\\', '\\\\')
def remove_password_file(filename):
- conf_file = find_properties_file()
- passFilePath = os.path.join(os.path.dirname(conf_file),
- filename)
+ passFilePath = os.path.join(get_conf_dir(), filename)
if os.path.exists(passFilePath):
try:
diff --git a/ambari-server/src/main/python/ambari_server/setupSecurity.py
b/ambari-server/src/main/python/ambari_server/setupSecurity.py
index 460e147739..9bb04445c2 100644
--- a/ambari-server/src/main/python/ambari_server/setupSecurity.py
+++ b/ambari-server/src/main/python/ambari_server/setupSecurity.py
@@ -44,7 +44,7 @@ from ambari_server.serverConfiguration import configDefaults,
parse_properties_f
get_credential_store_location, get_is_persisted, get_is_secure,
get_master_key_location, get_db_type, write_property, \
get_original_master_key, get_value_from_properties, get_java_exe_path,
is_alias_string, read_ambari_user, \
read_passwd_for_alias, remove_password_file, save_passwd_for_alias,
store_password_file, update_properties_2, \
- BLIND_PASSWORD, BOOTSTRAP_DIR_PROPERTY, JDBC_PASSWORD_FILENAME,
JDBC_PASSWORD_PROPERTY, \
+ AMBARI_PROPERTIES_FILE, BLIND_PASSWORD, BOOTSTRAP_DIR_PROPERTY,
JDBC_PASSWORD_FILENAME, JDBC_PASSWORD_PROPERTY, \
JDBC_RCA_PASSWORD_ALIAS, JDBC_RCA_PASSWORD_FILE_PROPERTY,
JDBC_USE_INTEGRATED_AUTH_PROPERTY, \
LDAP_MGR_PASSWORD_ALIAS, LDAP_MGR_PASSWORD_PROPERTY, CLIENT_SECURITY, \
SECURITY_IS_ENCRYPTION_ENABLED, SECURITY_SENSITIVE_DATA_ENCRYPTON_ENABLED,
SECURITY_KEY_ENV_VAR_NAME, SECURITY_KERBEROS_JASS_FILENAME, \
@@ -657,7 +657,7 @@ def deryptPasswordsConfigs(db_password, db_sql_auth,
masterKey, ts_password):
def printManualDecryptionWarning(db_password, db_sql_auth, ts_password):
print "To disable encryption, do the following:"
- print "- Edit " + find_properties_file() + \
+ print "- Edit " + os.path.join(get_conf_dir(), AMBARI_PROPERTIES_FILE) + \
" and set " + SECURITY_IS_ENCRYPTION_ENABLED + " = " + "false." + \
" and set " + SECURITY_SENSITIVE_DATA_ENCRYPTON_ENABLED + " = " +
"false." + \
" and set all passwords and sensitive data in service configs to right
value."
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
