You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/03 20:15:49 UTC
[02/22] ambari git commit: AMBARI-22100 : Devdeploy: HiveServer2
Interactive Start failed (mradhakrishnan)
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/9039f103
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9039f103
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9039f103
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 9039f103da033d14efcb82684f4194d896ceef9e
Parents: 51baa64
Author: Madhuvanthi Radhakrishnan <mr...@hortonworks.com>
Authored: Mon Oct 2 09:34:36 2017 -0700
Committer: Madhuvanthi Radhakrishnan <mr...@hortonworks.com>
Committed: Mon Oct 2 09:37:10 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/9039f103/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 7dd00de..645f824 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)