Repository: ambari Updated Branches: refs/heads/trunk 8dd9acc64 -> b902c1330
AMBARI-22467. YARN, MapReduce2, Hive, and Oozie Should Conditionally Install LZO (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b902c133 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b902c133 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b902c133 Branch: refs/heads/trunk Commit: b902c133035cc952a9081f5c0ffc8e967c2e6f44 Parents: 8dd9acc Author: Andrew Onishuk <[email protected]> Authored: Wed Nov 22 14:50:33 2017 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Wed Nov 22 14:52:43 2017 +0200 ---------------------------------------------------------------------- .../main/python/ambari_server/serverConfiguration.py | 12 ++++++++++++ .../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 1 - .../HDFS/3.0.0.3.0/package/scripts/hdfs.py | 1 - .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 1 - 4 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b902c133/ambari-server/src/main/python/ambari_server/serverConfiguration.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py index 5eb12e1..f744fa0 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -40,6 +40,7 @@ from ambari_server.properties import Properties from ambari_server.userInput import get_validated_string_input from ambari_server.utils import compare_versions, locate_file, on_powerpc from ambari_server.ambariPath import AmbariPath +from ambari_server.userInput import get_YN_input OS_VERSION = OSCheck().get_os_major_version() @@ -195,6 +196,15 @@ SETUP_OR_UPGRADE_MSG = "- If this is a new setup, then run the \"ambari-server s "- If this is an upgrade of an existing setup, run the \"ambari-server upgrade\" command.\n" \ "Refer to the Ambari documentation for more information on setup and upgrade." +GPL_LICENSE_PROMPT_TEXT = """To download GPL licensed products like lzo you must accept the license terms below: +LICENSE_LINE_1 +LICENSE_LINE_2 +LICENSE_LINE_3 +LICENSE_LINE_4 +LICENSE_LINE_5 +LICENSE_LINE_6 +Do you accept the GPL License Agreement [y/n] (y)?""" + DEFAULT_DB_NAME = "ambari" SECURITY_KEYS_DIR = "security.server.keys_dir" @@ -209,6 +219,8 @@ BOOTSTRAP_SETUP_AGENT_SCRIPT = 'bootstrap.setup_agent.script' STACKADVISOR_SCRIPT = 'stackadvisor.script' PID_DIR_PROPERTY = 'pid.dir' SERVER_TMP_DIR_PROPERTY = "server.tmp.dir" +GPL_LICENSE_ACCEPTED_PROPERTY = 'gpl.license.accepted' + REQUIRED_PROPERTIES = [OS_FAMILY_PROPERTY, OS_TYPE_PROPERTY, COMMON_SERVICES_PATH_PROPERTY, SERVER_VERSION_FILE_PATH, WEBAPP_DIR_PROPERTY, STACK_LOCATION_KEY, SECURITY_KEYS_DIR, JDBC_DATABASE_NAME_PROPERTY, NR_USER_PROPERTY, JAVA_HOME_PROPERTY, JDBC_PASSWORD_PROPERTY, SHARED_RESOURCES_DIR, http://git-wip-us.apache.org/repos/asf/ambari/blob/b902c133/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py index bc80ba6..d3d0cf8 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py @@ -26,7 +26,6 @@ from resource_management.core.source import Template from resource_management.core.resources.service import ServiceConfig from resource_management.libraries.resources.xml_config import XmlConfig -from resource_management.libraries.functions.get_lzo_packages import get_lzo_packages from resource_management.core.exceptions import Fail from resource_management.core.logger import Logger from resource_management.libraries.functions.format import format http://git-wip-us.apache.org/repos/asf/ambari/blob/b902c133/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs.py b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs.py index bc80ba6..d3d0cf8 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs.py +++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs.py @@ -26,7 +26,6 @@ from resource_management.core.source import Template from resource_management.core.resources.service import ServiceConfig from resource_management.libraries.resources.xml_config import XmlConfig -from resource_management.libraries.functions.get_lzo_packages import get_lzo_packages from resource_management.core.exceptions import Fail from resource_management.core.logger import Logger from resource_management.libraries.functions.format import format http://git-wip-us.apache.org/repos/asf/ambari/blob/b902c133/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py index 2306108..e9d48c0 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py @@ -38,7 +38,6 @@ from resource_management.libraries.resources.xml_config import XmlConfig from resource_management.libraries.functions.lzo_utils import install_lzo_if_needed from resource_management.libraries.script.script import Script from resource_management.libraries.functions.security_commons import update_credential_provider_path -from resource_management.libraries.functions.get_lzo_packages import get_lzo_packages from resource_management.core.resources.packaging import Package from resource_management.core.shell import as_user, as_sudo, call, checked_call from resource_management.core.exceptions import Fail
