Repository: ambari Updated Branches: refs/heads/trunk 21e37b164 -> 4aef8fe07
AMBARI-22555. Update server setup to deny GPL as default. Fixed for silent setup. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4aef8fe0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4aef8fe0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4aef8fe0 Branch: refs/heads/trunk Commit: 4aef8fe07fdabc684e2a25c4a4b78073710a5f77 Parents: 21e37b1 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Thu Nov 30 11:41:48 2017 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Thu Nov 30 11:41:48 2017 -0800 ---------------------------------------------------------------------- .../src/main/python/ambari_server/serverConfiguration.py | 4 ++-- ambari-server/src/main/python/ambari_server/serverSetup.py | 5 ++--- ambari-server/src/main/python/ambari_server/serverUpgrade.py | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4aef8fe0/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 d6ab453..27b4472 100644 --- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py +++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py @@ -1147,7 +1147,7 @@ def update_ambari_env(): return 0 # default should be false / not accepted -def write_gpl_license_accepted(text = GPL_LICENSE_PROMPT_TEXT): +def write_gpl_license_accepted(default_prompt_value = False, text = GPL_LICENSE_PROMPT_TEXT): properties = get_ambari_properties() if properties == -1: err = "Error getting ambari properties" @@ -1157,7 +1157,7 @@ def write_gpl_license_accepted(text = GPL_LICENSE_PROMPT_TEXT): if GPL_LICENSE_ACCEPTED_PROPERTY in properties.keys() and properties.get_property(GPL_LICENSE_ACCEPTED_PROPERTY).lower() == "true": return True - result = get_YN_input(text, False) + result = get_YN_input(text, default_prompt_value) properties.process_pair(GPL_LICENSE_ACCEPTED_PROPERTY, str(result).lower()) update_properties(properties) http://git-wip-us.apache.org/repos/asf/ambari/blob/4aef8fe0/ambari-server/src/main/python/ambari_server/serverSetup.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py index af45584..3b41fff 100644 --- a/ambari-server/src/main/python/ambari_server/serverSetup.py +++ b/ambari-server/src/main/python/ambari_server/serverSetup.py @@ -1182,9 +1182,8 @@ def setup(options): err = 'Downloading or installing JDK failed: {0}. Exiting.'.format(e) raise FatalException(e.code, err) - if not get_silent() or options.accept_gpl: - print 'Checking GPL software agreement...' - write_gpl_license_accepted() + print 'Checking GPL software agreement...' + write_gpl_license_accepted(default_prompt_value=options.accept_gpl) print 'Completing setup...' retcode = configure_os_settings() http://git-wip-us.apache.org/repos/asf/ambari/blob/4aef8fe0/ambari-server/src/main/python/ambari_server/serverUpgrade.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server/serverUpgrade.py b/ambari-server/src/main/python/ambari_server/serverUpgrade.py index c2b7de8..dd847e3 100644 --- a/ambari-server/src/main/python/ambari_server/serverUpgrade.py +++ b/ambari-server/src/main/python/ambari_server/serverUpgrade.py @@ -179,7 +179,7 @@ def check_gpl_license_approved(upgrade_response): if 'lzo_enabled' not in upgrade_response or upgrade_response['lzo_enabled'].lower() != "true": return - while not write_gpl_license_accepted(LZO_ENABLED_GPL_TEXT) and not get_YN_input(INSTALLED_LZO_WITHOUT_GPL_TEXT, False): + while not write_gpl_license_accepted(text = LZO_ENABLED_GPL_TEXT) and not get_YN_input(INSTALLED_LZO_WITHOUT_GPL_TEXT, False): pass #
