This is an automated email from the ASF dual-hosted git repository.
krisztiankasa pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new ca9851e AMBARI-24516 - Default value for LDAP type (#2276)
ca9851e is described below
commit ca9851ea960d3f9b015c88017b3af9832b804091
Author: kasakrisz <33458261+kasakr...@users.noreply.github.com>
AuthorDate: Tue Sep 11 13:47:55 2018 +0200
AMBARI-24516 - Default value for LDAP type (#2276)
---
ambari-server/src/main/python/ambari-server.py | 43 +++--
.../src/main/python/ambari_server/setupSecurity.py | 192 +
ambari-server/src/test/python/TestAmbariServer.py | 113 ++--
3 files changed, 247 insertions(+), 101 deletions(-)
diff --git a/ambari-server/src/main/python/ambari-server.py
b/ambari-server/src/main/python/ambari-server.py
index 6a05013..c1fc6eb 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -18,48 +18,46 @@ See the License for the specific language governing
permissions and
limitations under the License.
'''
+import logging
+import logging.config
+import logging.handlers
import optparse
-import sys
import os
import signal
-import logging
-import logging.handlers
-import logging.config
-
-from optparse import OptionValueError
+import sys
from ambari_commons.exceptions import FatalException, NonFatalException
from ambari_commons.logging_utils import set_verbose, set_silent, \
print_info_msg, print_warning_msg, print_error_msg,
set_debug_mode_from_options
from ambari_commons.os_check import OSConst
from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
from ambari_commons.os_utils import remove_file
+from optparse import OptionValueError
+
from ambari_server.BackupRestore import main as BackupRestore_main
+from ambari_server.checkDatabase import check_database
+from ambari_server.dbCleanup import db_purge
from ambari_server.dbConfiguration import DATABASE_NAMES, LINUX_DBMS_KEYS_LIST
+from ambari_server.enableStack import enable_stack_version
+from ambari_server.hostUpdate import update_host_names
+from ambari_server.kerberos_setup import setup_kerberos
from ambari_server.serverConfiguration import configDefaults,
get_ambari_properties, PID_NAME
-from ambari_server.serverUtils import is_server_runing, refresh_stack_hash,
wait_for_server_to_stop
from ambari_server.serverSetup import reset, setup, setup_jce_policy
from ambari_server.serverUpgrade import upgrade, set_current
+from ambari_server.serverUtils import is_server_runing, refresh_stack_hash,
wait_for_server_to_stop
+from ambari_server.setupActions import BACKUP_ACTION, LDAP_SETUP_ACTION,
LDAP_SYNC_ACTION, PSTART_ACTION, \
+ REFRESH_STACK_HASH_ACTION, RESET_ACTION, RESTORE_ACTION,
UPDATE_HOST_NAMES_ACTION, CHECK_DATABASE_ACTION, \
+ SETUP_ACTION, SETUP_SECURITY_ACTION, RESTART_ACTION, START_ACTION,
STATUS_ACTION, STOP_ACTION, UPGRADE_ACTION, \
+ SETUP_JCE_ACTION, SET_CURRENT_ACTION, ENABLE_STACK_ACTION, SETUP_SSO_ACTION,
\
+ DB_PURGE_ACTION, INSTALL_MPACK_ACTION, UNINSTALL_MPACK_ACTION,
UPGRADE_MPACK_ACTION, PAM_SETUP_ACTION, \
+ MIGRATE_LDAP_PAM_ACTION, KERBEROS_SETUP_ACTION
from ambari_server.setupHttps import setup_https, setup_truststore
from ambari_server.setupMpacks import install_mpack, uninstall_mpack,
upgrade_mpack, STACK_DEFINITIONS_RESOURCE_NAME, \
SERVICE_DEFINITIONS_RESOURCE_NAME, MPACKS_RESOURCE_NAME
+from ambari_server.setupSecurity import setup_ldap, sync_ldap,
setup_master_key, setup_ambari_krb5_jaas, setup_pam, \
+ migrate_ldap_pam, LDAP_TYPES
from ambari_server.setupSso import setup_sso
-from ambari_server.dbCleanup import db_purge
-from ambari_server.hostUpdate import update_host_names
-from ambari_server.checkDatabase import check_database
-from ambari_server.enableStack import enable_stack_version
-
-from ambari_server.setupActions import BACKUP_ACTION, LDAP_SETUP_ACTION,
LDAP_SYNC_ACTION, PSTART_ACTION, \
- REFRESH_STACK_HASH_ACTION, RESET_ACTION, RESTORE_ACTION,
UPDATE_HOST_NAMES_ACTION, CHECK_DATABASE_ACTION, \
- SETUP_ACTION, SETUP_SECURITY_ACTION,START_ACTION, STATUS_ACTION,
STOP_ACTION, RESTART_ACTION, UPGRADE_ACTION, \
- SETUP_JCE_ACTION, SET_CURRENT_ACTION, START_ACTION, STATUS_ACTION,
STOP_ACTION, UPGRADE_ACTION, \
- SETUP_JCE_ACTION, SET_CURRENT_ACTION, ENABLE_STACK_ACTION, SETUP_SSO_ACTION,
\
- DB_PURGE_ACTION, INSTALL_MPACK_ACTION, UNINSTALL_MPACK_ACTION,
UPGRADE_MPACK_ACTION, PAM_SETUP_ACTION, MIGRATE_LDAP_PAM_ACTION,
KERBEROS_SETUP_ACTION
-from ambari_server.setupSecurity import setup_ldap, sync_ldap,
setup_master_key, setup_ambari_krb5_jaas, setup_pam, migrate_ldap_pam
from ambari_server.userInput import get_validated_string_input
-from ambari_server.kerberos_setup import setup_kerberos
-
from ambari_server_main import server_process_main
-from ambari_server.amba
