You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mg...@apache.org on 2017/02/22 12:16:36 UTC
ambari git commit: AMBARI-20088 ADDENDUM Log Search should handle
turned off Credential Store too (mgergely)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 936c185bb -> a98e1b661
AMBARI-20088 ADDENDUM Log Search should handle turned off Credential Store too (mgergely)
Change-Id: I4b30e8df61a22ecfe494dac9441d590c1ecb5745
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a98e1b66
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a98e1b66
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a98e1b66
Branch: refs/heads/branch-2.5
Commit: a98e1b661ad27224dc992bbb45206233162ecdc2
Parents: 936c185
Author: Miklos Gergely <mg...@hortonworks.com>
Authored: Wed Feb 22 13:15:56 2017 +0100
Committer: Miklos Gergely <mg...@hortonworks.com>
Committed: Wed Feb 22 13:16:27 2017 +0100
----------------------------------------------------------------------
.../src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py | 6 ++++++
.../src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py | 6 ++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a98e1b66/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
index 064978b..0a7f074 100644
--- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
+++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py
@@ -60,6 +60,12 @@ class TestLogFeeder(RMFTestCase):
mode=0644,
content=''
)
+ self.assertResourceCalled('File', '/etc/ambari-logsearch-logfeeder/conf/keys/ks_pass.txt',
+ action = ['delete']
+ )
+ self.assertResourceCalled('File', '/etc/ambari-logsearch-logfeeder/conf/keys/ts_pass.txt',
+ action = ['delete']
+ )
self.assertResourceCalled('PropertiesFile', '/etc/ambari-logsearch-logfeeder/conf/logfeeder.properties',
properties={'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-logfeeder/conf/logfeeder.jceks',
'logfeeder.checkpoint.folder': '/etc/ambari-logsearch-logfeeder/conf/checkpoints',
http://git-wip-us.apache.org/repos/asf/ambari/blob/a98e1b66/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
index 587561a..b283a9f 100644
--- a/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
+++ b/ambari-server/src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py
@@ -76,6 +76,12 @@ class TestLogSearch(RMFTestCase):
mode = 0644,
content = ''
)
+ self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/keys/ks_pass.txt',
+ action = ['delete']
+ )
+ self.assertResourceCalled('File', '/etc/ambari-logsearch-portal/conf/keys/ts_pass.txt',
+ action = ['delete']
+ )
self.assertResourceCalled('PropertiesFile', '/etc/ambari-logsearch-portal/conf/logsearch.properties',
properties = {'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-portal/conf/logsearch.jceks',
'logsearch.audit.logs.split.interval.mins': '1',