Repository: ambari Updated Branches: refs/heads/branch-2.5 7921518f5 -> 681f89c53
AMBARI-19645 ADDENDUM Log Search should use Credential Store API to store keystore/truststore passwords - ambari side (mgergely) Change-Id: I74fa1b11f186672b4ba815dc1a25519b3d1d8c93 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/681f89c5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/681f89c5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/681f89c5 Branch: refs/heads/branch-2.5 Commit: 681f89c53e98f0891e205eaf1ba4805b2dee2866 Parents: 7921518 Author: Miklos Gergely <[email protected]> Authored: Thu Feb 9 14:39:04 2017 +0100 Committer: Miklos Gergely <[email protected]> Committed: Thu Feb 9 14:39:04 2017 +0100 ---------------------------------------------------------------------- .../src/test/python/stacks/2.4/LOGSEARCH/test_logfeeder.py | 2 +- .../src/test/python/stacks/2.4/LOGSEARCH/test_logsearch.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/681f89c5/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 00e8e1f..064978b 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 @@ -61,7 +61,7 @@ class TestLogFeeder(RMFTestCase): content='' ) self.assertResourceCalled('PropertiesFile', '/etc/ambari-logsearch-logfeeder/conf/logfeeder.properties', - properties={'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-logfeeder/conf/logfeeder-env.jceks', + properties={'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-logfeeder/conf/logfeeder.jceks', 'logfeeder.checkpoint.folder': '/etc/ambari-logsearch-logfeeder/conf/checkpoints', 'logfeeder.config.files': 'output.config.json,input.config-ambari.json,global.config.json,input.config-logsearch.json,input.config-zookeeper.json', 'logfeeder.metrics.collector.hosts': '', http://git-wip-us.apache.org/repos/asf/ambari/blob/681f89c5/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 380151c..db9cbb9 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 @@ -77,7 +77,7 @@ class TestLogSearch(RMFTestCase): content = '' ) self.assertResourceCalled('PropertiesFile', '/etc/ambari-logsearch-portal/conf/logsearch.properties', - properties = {'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-portal/conf/logsearch-env.jceks', + properties = {'hadoop.security.credential.provider.path': 'jceks://file/etc/ambari-logsearch-portal/conf/logsearch.jceks', 'logsearch.audit.logs.split.interval.mins': '1', 'logsearch.auth.external_auth.enabled': 'false', 'logsearch.auth.external_auth.host_url': 'http://c6401.ambari.apache.org:8080',
