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/09 13:38:42 UTC
ambari git commit: AMBARI-19645 ADDENDUM Log Search should use
Credential Store API to store keystore/truststore passwords - ambari side
(mgergely)
Repository: ambari
Updated Branches:
refs/heads/trunk 10a0ba464 -> a6de4ac27
AMBARI-19645 ADDENDUM Log Search should use Credential Store API to store keystore/truststore passwords - ambari side (mgergely)
Change-Id: I4665e934c8cc492b7b1581ce130b2072f145004d
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6de4ac2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6de4ac2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6de4ac2
Branch: refs/heads/trunk
Commit: a6de4ac27b7504cb03c4fee3affd6c3330589a60
Parents: 10a0ba4
Author: Miklos Gergely <mg...@hortonworks.com>
Authored: Thu Feb 9 14:38:01 2017 +0100
Committer: Miklos Gergely <mg...@hortonworks.com>
Committed: Thu Feb 9 14:38:34 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/a6de4ac2/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/a6de4ac2/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',