[ambari] branch trunk updated: AMBARI-23359. When credential store is enabled status commands should not generate jceks (aonishuk)

[ao...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 0ed3485  AMBARI-23359. When credential store is enabled status commands should not generate jceks (aonishuk)
0ed3485 is described below

commit 0ed348523be783fe52bd4e2ee54dbb297619a6f1
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Mon Mar 26 14:12:36 2018 +0300

    AMBARI-23359. When credential store is enabled status commands should not generate jceks (aonishuk)
---
 ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 9a57ae6..5a14768 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -365,7 +365,7 @@ class CustomServiceOrchestrator():
       if 'serviceLevelParams' in command and 'credentialStoreEnabled' in command['serviceLevelParams']:
         credentialStoreEnabled = command['serviceLevelParams']['credentialStoreEnabled']
 
-      if credentialStoreEnabled == True:
+      if credentialStoreEnabled and command_name != self.COMMAND_NAME_STATUS:
         if 'commandBeingRetried' not in command['agentLevelParams'] or command['agentLevelParams']['commandBeingRetried'] != "true":
           self.generateJceks(command)
         else:

-- 
To stop receiving notification emails like this one, please contact
aonishuk@apache.org.