You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2015/03/04 19:26:45 UTC
ambari git commit: AMBARI-9932. Ambari chown Storm conf dir which
prevent start of storm worker in secure mode with runas enabled.
(mpapyrkovskyy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 98c261692 -> 36b4d564d
AMBARI-9932. Ambari chown Storm conf dir which prevent start of storm worker in secure mode with runas enabled. (mpapyrkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36b4d564
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36b4d564
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36b4d564
Branch: refs/heads/branch-2.0.0
Commit: 36b4d564ddca94fa299464e54b9a5a65f7e79eff
Parents: 98c2616
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Wed Mar 4 20:06:27 2015 +0200
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Wed Mar 4 20:26:41 2015 +0200
----------------------------------------------------------------------
.../common-services/STORM/0.9.1.2.1/package/scripts/storm.py | 8 +++++++-
.../src/test/python/stacks/2.1/STORM/test_storm_base.py | 2 --
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/36b4d564/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
index c6f849b..b5b967e 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/storm.py
@@ -38,13 +38,19 @@ def storm():
recursive=True
)
- Directory([params.pid_dir, params.local_dir, params.conf_dir],
+ Directory([params.pid_dir, params.local_dir],
owner=params.storm_user,
group=params.user_group,
recursive=True,
cd_access="a",
)
+ Directory(params.conf_dir,
+ group=params.user_group,
+ recursive=True,
+ cd_access="a",
+ )
+
File(format("{conf_dir}/config.yaml"),
content=Template("config.yaml.j2"),
owner=params.storm_user,
http://git-wip-us.apache.org/repos/asf/ambari/blob/36b4d564/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
index 33d9309..3f68715 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
+++ b/ambari-server/src/test/python/stacks/2.1/STORM/test_storm_base.py
@@ -49,7 +49,6 @@ class TestStormBase(RMFTestCase):
cd_access='a'
)
self.assertResourceCalled('Directory', '/etc/storm/conf',
- owner = 'storm',
group = 'hadoop',
recursive = True,
cd_access='a'
@@ -91,7 +90,6 @@ class TestStormBase(RMFTestCase):
cd_access='a'
)
self.assertResourceCalled('Directory', '/etc/storm/conf',
- owner = 'storm',
group = 'hadoop',
recursive = True,
cd_access='a'