Repository: ambari Updated Branches: refs/heads/trunk 5b2863cd7 -> 1be1d0495
AMBARI-16645: clean up import * for Kerberos service scripts in common-services (Juanjo Marron via jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1be1d049 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1be1d049 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1be1d049 Branch: refs/heads/trunk Commit: 1be1d049531b695db7b830667ea1c51073ea06f0 Parents: 5b2863c Author: Jayush Luniya <[email protected]> Authored: Thu May 19 14:51:35 2016 -0700 Committer: Jayush Luniya <[email protected]> Committed: Thu May 19 14:51:35 2016 -0700 ---------------------------------------------------------------------- .../KERBEROS/1.10.3-10/package/scripts/kerberos_common.py | 8 +++++++- .../KERBEROS/1.10.3-10/package/scripts/params.py | 5 ++++- .../KERBEROS/1.10.3-10/package/scripts/service_check.py | 6 +++++- .../KERBEROS/1.10.3-10/package/scripts/status_params.py | 4 +++- 4 files changed, 19 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1be1d049/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_common.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_common.py b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_common.py index e06b13f..e2b97ca 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_common.py +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_common.py @@ -25,7 +25,13 @@ import sys import tempfile from tempfile import gettempdir -from resource_management import * +from resource_management.libraries.script.script import Script +from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.default import default +from resource_management.core.exceptions import Fail +from resource_management.core.logger import Logger +from resource_management.core.resources.system import Directory, Execute, File +from resource_management.core.source import InlineTemplate, Template, DownloadSource from utils import get_property_value from ambari_commons.os_utils import remove_file from ambari_agent import Constants http://git-wip-us.apache.org/repos/asf/ambari/blob/1be1d049/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/params.py index 906d521..fe367b6 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/params.py @@ -17,10 +17,13 @@ limitations under the License. """ -from resource_management import * +from resource_management.libraries.script.script import Script from utils import get_property_value, get_unstructured_data from ambari_commons.os_check import OSCheck +from resource_management.libraries.functions.default import default from resource_management.libraries.functions.expect import expect +from resource_management.libraries.functions.format import format + krb5_conf_dir = '/etc' krb5_conf_file = 'krb5.conf' http://git-wip-us.apache.org/repos/asf/ambari/blob/1be1d049/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/service_check.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/service_check.py index 7c09171..1c042a7 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/service_check.py +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/service_check.py @@ -18,9 +18,13 @@ limitations under the License. Ambari Agent """ +from resource_management.libraries import functions +from resource_management.libraries.functions.format import format +from resource_management.core.resources.system import Execute, File +from resource_management.core.logger import Logger from kerberos_common import * -from resource_management import * + # hashlib is supplied as of Python 2.5 as the replacement interface for md5 # and other secure hashes. In 2.6, md5 is deprecated. Import hashlib if http://git-wip-us.apache.org/repos/asf/ambari/blob/1be1d049/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/status_params.py index bbae4a3..8a840fb 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/status_params.py @@ -17,7 +17,9 @@ limitations under the License. """ -from resource_management import * +from resource_management.libraries.script.script import Script +from resource_management.libraries import functions +from resource_management.libraries.functions import default config = Script.get_config() tmp_dir = Script.get_tmp_dir()
