Repository: ambari Updated Branches: refs/heads/trunk e582b1e3e -> 201b7e958
AMBARI-7429 /etc/oozie/conf directory doesn't exist for Oozie (+Falcon, Slider) for HDP2.2 (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/201b7e95 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/201b7e95 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/201b7e95 Branch: refs/heads/trunk Commit: 201b7e9584c98f6dd93884999dbdced158e68428 Parents: e582b1e Author: Dmytro Sen <[email protected]> Authored: Mon Sep 22 15:28:57 2014 +0300 Committer: Dmytro Sen <[email protected]> Committed: Mon Sep 22 16:16:04 2014 +0300 ---------------------------------------------------------------------- .../2.0.6/services/OOZIE/package/scripts/oozie.py | 10 +++++----- .../services/OOZIE/package/scripts/params.py | 13 ++++++------- .../2.1/services/FALCON/package/scripts/falcon.py | 4 ++++ .../2.2/services/SLIDER/package/scripts/slider.py | 3 ++- .../stacks/2.0.6/OOZIE/test_oozie_client.py | 18 ++++++++++-------- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 18 ++++++++++-------- .../stacks/2.1/FALCON/test_falcon_client.py | 4 ++++ .../stacks/2.1/FALCON/test_falcon_server.py | 4 ++++ .../stacks/2.2/SLIDER/test_slider_client.py | 4 +++- 9 files changed, 48 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py index d390c69..667362c 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/oozie.py @@ -31,6 +31,11 @@ def oozie(is_server=False # TODO: see if see can remove this owner=params.oozie_user, mode=params.oozie_hdfs_user_mode ) + Directory( params.conf_dir, + recursive = True, + owner = params.oozie_user, + group = params.user_group + ) XmlConfig( "oozie-site.xml", conf_dir = params.conf_dir, configurations = params.config['configurations']['oozie-site'], @@ -39,11 +44,6 @@ def oozie(is_server=False # TODO: see if see can remove this group = params.user_group, mode = 0664 ) - Directory( params.conf_dir, - owner = params.oozie_user, - group = params.user_group - ) - File(format("{conf_dir}/oozie-env.sh"), owner=params.oozie_user, content=InlineTemplate(params.oozie_env_sh_template) http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py index 4bce882..e81fd24 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/OOZIE/package/scripts/params.py @@ -30,17 +30,16 @@ rpm_version = default("/configurations/hadoop-env/rpm_version", None) #hadoop params if rpm_version is not None: - hadoop_conf_dir = format("/usr/hdp/{rpm_version}/etc/hadoop/conf") - hadoop_bin_dir = format("/usr/hdp/{rpm_version}/hadoop/bin") - hadoop_lib_home = format("/usr/hdp/{rpm_version}/hadoop/lib") - mapreduce_libs_path = format("/usr/hdp/{rpm_version}/hadoop-mapreduce/*") - conf_dir = format("/usr/hdp/{rpm_version}/oozie/conf") + hadoop_bin_dir = "/usr/hdp/current/hadoop/bin" + hadoop_lib_home = "/usr/hdp/current/hadoop/lib" + mapreduce_libs_path = "/usr/hdp/current/hadoop-mapreduce/*" else: - hadoop_conf_dir = "/etc/hadoop/conf" hadoop_bin_dir = "/usr/bin" hadoop_lib_home = "/usr/lib/hadoop/lib" mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*" - conf_dir = "/etc/oozie/conf" + +hadoop_conf_dir = "/etc/hadoop/conf" +conf_dir = "/etc/oozie/conf" oozie_user = config['configurations']['oozie-env']['oozie_user'] smokeuser = config['configurations']['cluster-env']['smokeuser'] http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py index 880e2d4..25ecef8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/package/scripts/falcon.py @@ -34,6 +34,10 @@ def falcon(type, action = None): Directory(params.falcon_home, owner=params.falcon_user ) + Directory(params.falcon_conf_dir, + owner=params.falcon_user, + recursive=True + ) File(params.falcon_conf_dir + '/falcon-env.sh', content=InlineTemplate(params.falcon_env_sh_template) ) http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py index 87e93f8..a3b6238 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/slider.py @@ -26,7 +26,8 @@ from resource_management import * def slider(): import params - Directory(params.slider_conf_dir + Directory(params.slider_conf_dir, + recursive=True ) XmlConfig("slider-client.xml", http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py index 50c99e0..7afbf96 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_client.py @@ -28,6 +28,11 @@ class TestOozieClient(RMFTestCase): command = "configure", config_file="default.json" ) + self.assertResourceCalled('Directory', '/etc/oozie/conf', + owner = 'oozie', + group = 'hadoop', + recursive = True + ) self.assertResourceCalled('XmlConfig', 'oozie-site.xml', owner = 'oozie', group = 'hadoop', @@ -36,10 +41,6 @@ class TestOozieClient(RMFTestCase): configurations = self.getConfig()['configurations']['oozie-site'], configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) - self.assertResourceCalled('Directory', '/etc/oozie/conf', - owner = 'oozie', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']) @@ -79,6 +80,11 @@ class TestOozieClient(RMFTestCase): command = "configure", config_file="secured.json" ) + self.assertResourceCalled('Directory', '/etc/oozie/conf', + owner = 'oozie', + group = 'hadoop', + recursive = True + ) self.assertResourceCalled('XmlConfig', 'oozie-site.xml', owner = 'oozie', group = 'hadoop', @@ -87,10 +93,6 @@ class TestOozieClient(RMFTestCase): configurations = self.getConfig()['configurations']['oozie-site'], configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) - self.assertResourceCalled('Directory', '/etc/oozie/conf', - owner = 'oozie', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']) http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py index 5740587..d64af57 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py @@ -125,6 +125,11 @@ class TestOozieServer(RMFTestCase): bin_dir = '/usr/bin', action = ['create'], ) + self.assertResourceCalled('Directory', '/etc/oozie/conf', + owner = 'oozie', + group = 'hadoop', + recursive = True + ) self.assertResourceCalled('XmlConfig', 'oozie-site.xml', owner = 'oozie', group = 'hadoop', @@ -133,10 +138,6 @@ class TestOozieServer(RMFTestCase): configurations = self.getConfig()['configurations']['oozie-site'], configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) - self.assertResourceCalled('Directory', '/etc/oozie/conf', - owner = 'oozie', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']) @@ -228,6 +229,11 @@ class TestOozieServer(RMFTestCase): bin_dir = '/usr/bin', action = ['create'], ) + self.assertResourceCalled('Directory', '/etc/oozie/conf', + owner = 'oozie', + group = 'hadoop', + recursive = True + ) self.assertResourceCalled('XmlConfig', 'oozie-site.xml', owner = 'oozie', group = 'hadoop', @@ -236,10 +242,6 @@ class TestOozieServer(RMFTestCase): configurations = self.getConfig()['configurations']['oozie-site'], configuration_attributes = self.getConfig()['configuration_attributes']['oozie-site'] ) - self.assertResourceCalled('Directory', '/etc/oozie/conf', - owner = 'oozie', - group = 'hadoop', - ) self.assertResourceCalled('File', '/etc/oozie/conf/oozie-env.sh', owner = 'oozie', content = InlineTemplate(self.getConfig()['configurations']['oozie-env']['content']) http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py index 18268d7..325c06a 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py @@ -40,6 +40,10 @@ class TestFalconClient(RMFTestCase): self.assertResourceCalled('Directory', '/usr/lib/falcon', owner = 'falcon', ) + self.assertResourceCalled('Directory', '/etc/falcon/conf', + owner = 'falcon', + recursive = True + ) self.assertResourceCalled('File', '/etc/falcon/conf/falcon-env.sh', content = InlineTemplate(self.getConfig()['configurations']['falcon-env']['content']), ) http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py index 2282dcc..d747482 100644 --- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py +++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_server.py @@ -71,6 +71,10 @@ class TestFalconServer(RMFTestCase): self.assertResourceCalled('Directory', '/usr/lib/falcon', owner = 'falcon', ) + self.assertResourceCalled('Directory', '/etc/falcon/conf', + owner = 'falcon', + recursive = True + ) self.assertResourceCalled('File', '/etc/falcon/conf/falcon-env.sh', content = InlineTemplate(self.getConfig()['configurations']['falcon-env']['content']), ) http://git-wip-us.apache.org/repos/asf/ambari/blob/201b7e95/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py index 0b493f5..00d9057 100644 --- a/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py +++ b/ambari-server/src/test/python/stacks/2.2/SLIDER/test_slider_client.py @@ -29,7 +29,9 @@ class TestSliderClient(RMFTestCase): config_file="default.json" ) - self.assertResourceCalled('Directory', '/usr/lib/slider/conf' + self.assertResourceCalled('Directory', + '/usr/lib/slider/conf', + recursive=True ) self.assertResourceCalled('XmlConfig',
