Repository: ambari Updated Branches: refs/heads/trunk ecce96ad6 -> 8f4ff3950
AMBARI-8848. hdp-select set all <version> uses 2.2.0.0 instead of 2.2 (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f4ff395 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f4ff395 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f4ff395 Branch: refs/heads/trunk Commit: 8f4ff3950e62ae3e6abb3dc9a60bd7d54d7d3b35 Parents: ecce96a Author: Alejandro Fernandez <[email protected]> Authored: Fri Dec 19 17:37:02 2014 -0800 Committer: Alejandro Fernandez <[email protected]> Committed: Fri Dec 19 19:39:16 2014 -0800 ---------------------------------------------------------------------- .../FALCON/0.5.0.2.1/package/scripts/params.py | 4 ++-- .../FLUME/1.4.0.2.0/package/scripts/params.py | 4 ++-- .../HBASE/0.96.0.2.0/package/scripts/params.py | 4 ++-- .../HIVE/0.12.0.2.0/package/scripts/params.py | 4 ++-- .../KAFKA/0.8.1.2.2/package/scripts/params.py | 4 ++-- .../common-services/KNOX/0.5.0.2.2/package/scripts/params.py | 4 ++-- .../common-services/PIG/0.12.0.2.0/package/scripts/params.py | 4 ++-- .../SLIDER/0.60.0.2.2/package/scripts/params.py | 4 ++-- .../SQOOP/1.4.4.2.0/package/scripts/params.py | 4 ++-- .../STORM/0.9.1.2.1/package/scripts/params.py | 4 ++-- .../common-services/TEZ/0.4.0.2.1/package/scripts/params.py | 4 ++-- .../ZOOKEEPER/3.4.5.2.0/package/scripts/params.py | 4 ++-- .../BIGTOP/0.8/services/HIVE/package/scripts/params.py | 1 + .../stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py | 3 ++- .../stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py | 5 ++--- .../hooks/after-INSTALL/scripts/shared_initialization.py | 8 ++++---- .../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 6 +++--- .../2.0.6/hooks/before-ANY/scripts/shared_initialization.py | 2 +- .../stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py | 4 ++-- .../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 4 ++-- .../stacks/HDP/2.0.6/services/YARN/package/scripts/params.py | 4 ++-- .../2.2.GlusterFS/services/KAFKA/package/scripts/params.py | 4 ++-- .../2.2.GlusterFS/services/KNOX/package/scripts/params.py | 4 ++-- .../2.2.GlusterFS/services/SLIDER/package/scripts/params.py | 4 ++-- 24 files changed, 49 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py index 19b647e..73258fe 100644 --- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py @@ -24,8 +24,8 @@ from status_params import * config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #hadoop params if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py index 2997867..409691f 100644 --- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py @@ -27,8 +27,8 @@ proxyuser_group = config['configurations']['hadoop-env']['proxyuser_group'] security_enabled = False -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #hadoop params if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params.py index e10c0ec..1f970fc 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params.py @@ -29,8 +29,8 @@ exec_tmp_dir = Script.get_tmp_dir() version = default("/commandParams/version", None) -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #hadoop params if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py index 774e811..21a6e09 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params.py @@ -28,8 +28,8 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() # This is expected to be of the form #.#.#.# -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) stack_is_hdp21 = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.1') >= 0 and compare_versions(hdp_stack_version, '2.2') < 0 # New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py index dc98526..2b0e14a 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py @@ -25,8 +25,8 @@ import status_params # server configurations config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: kafka_home = '/usr/hdp/current/kafka-broker/' http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py index 2327a66..a2b122a 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params.py @@ -26,8 +26,8 @@ import status_params config = Script.get_config() tmp_dir = Script.get_tmp_dir() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: knox_bin = '/usr/hdp/current/knox-server/bin/gateway.sh' http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py index 75ea5c5..d7bf5eb 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/params.py @@ -26,8 +26,8 @@ from resource_management import * config = Script.get_config() tmp_dir = Script.get_tmp_dir() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) # New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade version = default("/commandParams/version", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py index 657feba..3164806 100644 --- a/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SLIDER/0.60.0.2.2/package/scripts/params.py @@ -24,8 +24,8 @@ from resource_management import * # server configurations config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #hadoop params if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py index e8a3ac7..780b6d8 100644 --- a/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/SQOOP/1.4.4.2.0/package/scripts/params.py @@ -22,8 +22,8 @@ from resource_management import * config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #hadoop params if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py index ec74d77..a3bfb16 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py @@ -25,8 +25,8 @@ import status_params # server configurations config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0 #hadoop params http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py index 31162cd..13ab77f 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/package/scripts/params.py @@ -25,8 +25,8 @@ from resource_management import * config = Script.get_config() # This is expected to be of the form #.#.#.# -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) # New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade version = default("/commandParams/version", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py index 1bdc698..929d5d8 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params.py @@ -28,8 +28,8 @@ import status_params config = Script.get_config() tmp_dir = Script.get_tmp_dir() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) # New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade version = default("/commandParams/version", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py index ac3c4a0..90235e9 100644 --- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/package/scripts/params.py @@ -29,6 +29,7 @@ tmp_dir = Script.get_tmp_dir() #RPM versioning support rpm_version = default("/configurations/cluster-env/rpm_version", None) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) hdp_stack_version = config['hostLevelParams']['stack_version'] #hadoop params http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py index 1f85b75..c4ba90c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py @@ -46,7 +46,8 @@ hdfs_log_dir_prefix = config['configurations']['hadoop-env']['hdfs_log_dir_prefi hadoop_pid_dir_prefix = config['configurations']['hadoop-env']['hadoop_pid_dir_prefix'] hadoop_root_logger = config['configurations']['hadoop-env']['hadoop_root_logger'] -hdp_stack_version = format_hdp_stack_version(str(config['hostLevelParams']['stack_version'])) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.0') >= 0 and compare_versions(hdp_stack_version, '2.1') < 0 and System.get_instance().os_family != "suse": # deprecated rhel jsvc_path jsvc_path = "/usr/libexec/bigtop-utils" http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py index 64c7979..5aee113 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py @@ -23,9 +23,8 @@ from resource_management.core.system import System config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_full_stack_version = hdp_stack_version -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #hadoop params if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py index acd45f8..f256688 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py @@ -21,14 +21,14 @@ from resource_management import * def setup_hdp_install_directory(): import params - if params.hdp_stack_version != "" and compare_versions(params.hdp_stack_version, '2.2') >= 0: - Execute(format('sudo /usr/bin/hdp-select set all `ambari-python-wrap /usr/bin/hdp-select versions | grep ^{hdp_stack_version} | tail -1`'), - only_if=format('ls -d /usr/hdp/{hdp_stack_version}*') + if params.hdp_stack_version != "" and compare_versions(params.stack_version_unformatted, '2.2') >= 0: + Execute(format('sudo /usr/bin/hdp-select set all `ambari-python-wrap /usr/bin/hdp-select versions | grep ^{stack_version_unformatted} | tail -1`'), + only_if=format('ls -d /usr/hdp/{stack_version_unformatted}*') ) def setup_config(): import params - stackversion = params.hdp_full_stack_version + stackversion = params.stack_version_unformatted if params.has_namenode or stackversion.find('Gluster') >= 0: XmlConfig("core-site.xml", conf_dir=params.hadoop_conf_dir, http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py index fd38d92..3b23204 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py @@ -33,10 +33,10 @@ java_home = config['hostLevelParams']['java_home'] ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0] -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_full_stack_version = hdp_stack_version +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) + security_enabled = config['configurations']['cluster-env']['security_enabled'] -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) hdfs_user = config['configurations']['hadoop-env']['hdfs_user'] # Some datanode settings http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py index bf9c055..54d18ea 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py @@ -105,7 +105,7 @@ def set_uid(user, user_dirs): def setup_hadoop_env(): import params - stackversion = params.hdp_full_stack_version + stackversion = params.stack_version_unformatted if params.has_namenode or stackversion.find('Gluster') >= 0: if params.security_enabled: tc_owner = "root" http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py index 0bf59e1..9b8dd12 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-INSTALL/scripts/params.py @@ -26,8 +26,8 @@ import collections config = Script.get_config() tmp_dir = Script.get_tmp_dir() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #users and groups hbase_user = config['configurations']['hbase-env']['hbase_user'] http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py index 4fbfd22..d65765b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py @@ -24,8 +24,8 @@ import os config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) #hadoop params if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py index fda08a0..d9c73bf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py @@ -29,8 +29,8 @@ config = Script.get_config() tmp_dir = Script.get_tmp_dir() # This is expected to be of the form #.#.#.# -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) # New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade version = default("/commandParams/version", None) http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py index 83d6d73..0dd306a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/package/scripts/params.py @@ -25,8 +25,8 @@ import status_params # server configurations config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0 if stack_is_hdp22_or_further: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py index 326d678..b11eddb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/package/scripts/params.py @@ -26,8 +26,8 @@ import status_params config = Script.get_config() tmp_dir = Script.get_tmp_dir() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0 if stack_is_hdp22_or_further: http://git-wip-us.apache.org/repos/asf/ambari/blob/8f4ff395/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py index 467a29f..121bbd4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/SLIDER/package/scripts/params.py @@ -24,8 +24,8 @@ from resource_management import * # server configurations config = Script.get_config() -hdp_stack_version = str(config['hostLevelParams']['stack_version']) -hdp_stack_version = format_hdp_stack_version(hdp_stack_version) +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) stack_is_hdp22_or_further = hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0 #hadoop params
