You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/03/10 00:50:19 UTC
[27/51] [abbrv] ambari git commit: AMBARI-15342. AMS Grafana start
failed with permission denied error on changing user. (swagle)
AMBARI-15342. AMS Grafana start failed with permission denied error on changing user. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/249014b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/249014b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/249014b3
Branch: refs/heads/AMBARI-13364
Commit: 249014b373a0a2fc6757f8bebc5bfb1e7929c166
Parents: 2c2c201
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Tue Mar 8 17:54:07 2016 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Tue Mar 8 17:54:07 2016 -0800
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 5 +++++
.../stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py | 12 ++++++++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/249014b3/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
index c8c3b6d..cbdcf45 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
@@ -420,6 +420,11 @@ def ams(name=None):
content=InlineTemplate(params.ams_grafana_ini_template)
)
+ for dir in ams_grafana_directories:
+ Execute(('chown', '-R', params.ams_user, dir),
+ sudo=True
+ )
+
if params.metric_collector_https_enabled:
export_ca_certs(params.ams_grafana_conf_dir)
http://git-wip-us.apache.org/repos/asf/ambari/blob/249014b3/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
index eab50d4..d54acc7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/AMBARI_METRICS/test_metrics_grafana.py
@@ -49,6 +49,18 @@ class TestMetricsGrafana(RMFTestCase):
)
self.maxDiff=None
self.assert_configure()
+ self.assertResourceCalled('Execute', ('chown', u'-R', u'ams', '/etc/ambari-metrics-grafana/conf'),
+ sudo = True
+ )
+ self.assertResourceCalled('Execute', ('chown', u'-R', u'ams', '/var/log/ambari-metrics-grafana'),
+ sudo = True
+ )
+ self.assertResourceCalled('Execute', ('chown', u'-R', u'ams', '/var/lib/ambari-metrics-grafana'),
+ sudo = True
+ )
+ self.assertResourceCalled('Execute', ('chown', u'-R', u'ams', '/var/run/ambari-metrics-grafana'),
+ sudo = True
+ )
self.assertResourceCalled('Execute', 'ambari-sudo.sh /usr/jdk64/jdk1.7.0_45/bin/keytool -importkeystore -srckeystore /etc/security/clientKeys/all.jks -destkeystore /some_tmp_dir/truststore.p12 -deststoretype PKCS12 -srcstorepass bigdata -deststorepass bigdata',
)
self.assertResourceCalled('Execute', 'ambari-sudo.sh openssl pkcs12 -in /some_tmp_dir/truststore.p12 -out /etc/ambari-metrics-grafana/conf/ca.pem -cacerts -nokeys -passin pass:bigdata',