You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/06/18 18:14:29 UTC
git commit: AMBARI-6190. /conf symlink issues (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 30b42a4f5 -> 3ca5fece0
AMBARI-6190. /conf symlink issues (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ca5fece
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ca5fece
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ca5fece
Branch: refs/heads/trunk
Commit: 3ca5fece0f6f72f209ab99f2c2b003e4f47962d3
Parents: 30b42a4
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Jun 18 19:14:22 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Jun 18 19:14:22 2014 +0300
----------------------------------------------------------------------
.../1.3.2/hooks/after-INSTALL/scripts/shared_initialization.py | 3 ++-
.../2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py | 3 ++-
.../python/stacks/1.3.2/hooks/after-INSTALL/test_after_install.py | 3 ++-
.../python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ca5fece/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/scripts/shared_initialization.py
index c5aff35..b3c0189 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/after-INSTALL/scripts/shared_initialization.py
@@ -32,7 +32,8 @@ def setup_hadoop_env():
group='root'
)
Link(params.hadoop_conf_dir,
- to=params.hadoop_conf_empty_dir
+ to=params.hadoop_conf_empty_dir,
+ not_if=format("ls {hadoop_conf_dir}")
)
File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ca5fece/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
index 9b3b817..14aa6b6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/shared_initialization.py
@@ -31,7 +31,8 @@ def setup_hadoop_env():
group='root'
)
Link(params.hadoop_conf_dir,
- to=params.hadoop_conf_empty_dir
+ to=params.hadoop_conf_empty_dir,
+ not_if=format("ls {hadoop_conf_dir}")
)
File(os.path.join(params.hadoop_conf_dir, 'hadoop-env.sh'),
owner=tc_owner,
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ca5fece/ambari-server/src/test/python/stacks/1.3.2/hooks/after-INSTALL/test_after_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/1.3.2/hooks/after-INSTALL/test_after_install.py b/ambari-server/src/test/python/stacks/1.3.2/hooks/after-INSTALL/test_after_install.py
index 8bb41a2..f15246f 100644
--- a/ambari-server/src/test/python/stacks/1.3.2/hooks/after-INSTALL/test_after_install.py
+++ b/ambari-server/src/test/python/stacks/1.3.2/hooks/after-INSTALL/test_after_install.py
@@ -36,7 +36,8 @@ class TestHookAfterInstall(RMFTestCase):
recursive = True,
)
self.assertResourceCalled('Link', '/etc/hadoop/conf',
- to = '/etc/hadoop/conf.empty'
+ to = '/etc/hadoop/conf.empty',
+ not_if = 'ls /etc/hadoop/conf'
)
self.assertResourceCalled('File', '/etc/hadoop/conf/hadoop-env.sh',
content = Template('hadoop-env.sh.j2'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ca5fece/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
index 18ae40e..b8ccf58 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
@@ -36,7 +36,8 @@ class TestHookAfterInstall(RMFTestCase):
recursive = True,
)
self.assertResourceCalled('Link', '/etc/hadoop/conf',
- to = '/etc/hadoop/conf.empty'
+ to = '/etc/hadoop/conf.empty',
+ not_if = 'ls /etc/hadoop/conf'
)
self.assertResourceCalled('File', '/etc/hadoop/conf/hadoop-env.sh',
content = Template('hadoop-env.sh.j2'),