Repository: ambari Updated Branches: refs/heads/branch-2.5 cba0c04af -> ed353f0a0 refs/heads/trunk aa16f5ed8 -> 4a5b2f6f5
AMBARI-17666. Fix python test error: cannot import name ensure_ssl_using_tls_v1 (adoroszlai via dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed353f0a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed353f0a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed353f0a Branch: refs/heads/branch-2.5 Commit: ed353f0a0bd8838f2be8ad5b6629068ed544e428 Parents: cba0c04 Author: Lisnichenko Dmitro <[email protected]> Authored: Fri Dec 16 16:40:29 2016 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Fri Dec 16 16:40:29 2016 +0200 ---------------------------------------------------------------------- .../common-services/HDFS/3.0.0/package/scripts/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ed353f0a/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py b/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py index 4577ad2..f76935a 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py +++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0/package/scripts/utils.py @@ -34,10 +34,11 @@ from resource_management.libraries.functions.curl_krb_request import curl_krb_re from resource_management.core.exceptions import Fail from resource_management.libraries.functions.namenode_ha_utils import get_namenode_states from resource_management.libraries.functions.show_logs import show_logs -from ambari_commons.inet_utils import ensure_ssl_using_tls_v1 +from resource_management.libraries.script.script import Script +from ambari_commons.inet_utils import ensure_ssl_using_protocol from zkfc_slave import ZkfcSlaveDefault -ensure_ssl_using_tls_v1() +ensure_ssl_using_protocol(Script.get_force_https_protocol()) def safe_zkfc_op(action, env): """
