AMBARI-21522 - Installation Commands On New Clusters Don't Send Down Correct Versions (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6b4d0930 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6b4d0930 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6b4d0930 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 6b4d0930ae2acf09c9933f35f7dcf007b6ee0f19 Parents: da81658 Author: Dmytro Sen <[email protected]> Authored: Wed Jul 19 18:38:00 2017 +0300 Committer: Jonathan Hurley <[email protected]> Committed: Wed Jul 19 20:16:47 2017 -0400 ---------------------------------------------------------------------- .../ATLAS/0.1.0.2.3/package/scripts/atlas_client.py | 2 +- .../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6b4d0930/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py index 26742ae..2414fff 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/atlas_client.py @@ -37,7 +37,7 @@ class AtlasClient(Script): import params env.set_params(params) - if check_stack_feature(StackFeature.ATLAS_UPGRADE_SUPPORT, params.version): + if check_stack_feature(StackFeature.ATLAS_UPGRADE_SUPPORT, params.version_for_stack_feature_checks): conf_select.select(params.stack_name, "atlas", params.version) stack_select.select("atlas-client", params.version) http://git-wip-us.apache.org/repos/asf/ambari/blob/6b4d0930/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py index 0c84b5c..3ed469a 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py @@ -30,6 +30,7 @@ from resource_management.libraries.functions.default import default # Local Imports from status_params import * from resource_management.libraries.functions.stack_features import check_stack_feature +from resource_management.libraries.functions.stack_features import get_stack_feature_version from resource_management.libraries.functions import StackFeature from resource_management.libraries.functions.is_empty import is_empty from resource_management.libraries.functions.expect import expect @@ -100,6 +101,7 @@ if security_enabled: # New Cluster Stack Version that is defined during the RESTART of a Stack Upgrade version = default("/commandParams/version", None) +version_for_stack_feature_checks = get_stack_feature_version(config) # stack version stack_version_unformatted = config['hostLevelParams']['stack_version']
