ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mradhakrish...@apache.org
Subject ambari git commit: AMBARI-22100 : Devdeploy: HiveServer2 Interactive Start failed (mradhakrishnan)
Date Mon, 02 Oct 2017 16:35:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 4a29c923f -> fee91467f


AMBARI-22100 : Devdeploy: HiveServer2 Interactive Start failed (mradhakrishnan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fee91467
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fee91467
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fee91467

Branch: refs/heads/branch-2.6
Commit: fee91467fa1ef1d2ef9f0cdc88dda986ff10c7bb
Parents: 4a29c92
Author: Madhuvanthi Radhakrishnan <mradhakrishnan@hortonworks.com>
Authored: Mon Oct 2 09:34:36 2017 -0700
Committer: Madhuvanthi Radhakrishnan <mradhakrishnan@hortonworks.com>
Committed: Mon Oct 2 09:35:09 2017 -0700

----------------------------------------------------------------------
 .../src/main/python/ambari_agent/CustomServiceOrchestrator.py  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/fee91467/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 8a433c8..f081c6e 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -281,7 +281,11 @@ class CustomServiceOrchestrator():
 
     for config_type, credentials in configtype_credentials.items():
       config = commandJson['configurations'][config_type]
-      file_path = os.path.join(self.getProviderDirectory(serviceName), "{0}.jceks".format(config_type))
+      if 'role' in commandJson and commandJson['role']:
+        roleName = commandJson['role']
+        file_path = os.path.join(self.getProviderDirectory(roleName), "{0}.jceks".format(config_type))
+      else:
+        file_path = os.path.join(self.getProviderDirectory(serviceName), "{0}.jceks".format(config_type))
       if os.path.exists(file_path):
         os.remove(file_path)
       provider_path = 'jceks://file{file_path}'.format(file_path=file_path)


Mime
View raw message