AMBARI-22029. Download Client Configs fails. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cf1a2ce Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cf1a2ce Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cf1a2ce Branch: refs/heads/branch-2.6 Commit: 1cf1a2cecde6c229397e0568f8f9cf36599c6bc9 Parents: 1a86772 Author: Myroslav Papirkovskyi <mpapyrkovs...@hortonworks.com> Authored: Mon Sep 25 19:09:44 2017 +0300 Committer: Myroslav Papirkovskyi <mpapyrkovs...@hortonworks.com> Committed: Mon Sep 25 19:09:44 2017 +0300 ---------------------------------------------------------------------- .../server/controller/internal/ClientConfigResourceProvider.java | 2 ++ .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf1a2ce/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java index fb90e15..9d2b39e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java @@ -447,6 +447,8 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv jsonContent.put("hostname", hostName); jsonContent.put("public_hostname", publicHostName); jsonContent.put("clusterName", cluster.getClusterName()); + jsonContent.put("serviceName", serviceName); + jsonContent.put("role", componentName); jsonConfigurations = gson.toJson(jsonContent); File tmpDirectory = new File(TMP_PATH); http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf1a2ce/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py index 4326527..cd1f7ad 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py @@ -56,6 +56,8 @@ architecture = get_architecture() # Needed since this writes out the Atlas Hive Hook config file. cluster_name = config['clusterName'] +serviceName = config['serviceName'] +role = config['role'] hostname = config["hostname"]
