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/11/03 15:56:03 UTC
[1/2] git commit: AMBARI-8116. Installing Oozie without Hive or Tez
fails the deploy (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 7c5dc8cea -> 0311fbb17
refs/heads/trunk 38853c94f -> 1ac1eecf7
AMBARI-8116. Installing Oozie without Hive or Tez fails the deploy (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1ac1eecf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1ac1eecf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1ac1eecf
Branch: refs/heads/trunk
Commit: 1ac1eecf7a0686ab421c1b4d7577fe9f03aa6906
Parents: 38853c9
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Nov 3 16:55:49 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Nov 3 16:55:49 2014 +0200
----------------------------------------------------------------------
.../HDP/2.0.6/services/OOZIE/package/scripts/oozie.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ac1eecf/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 f33fe81..8f06a3d 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
@@ -164,15 +164,16 @@ def oozie_server_specific():
owner = params.oozie_user,
group = params.user_group
)
- if params.config['configurations']['hive-site']:
+ if 'hive-site' in params.config['configurations']:
XmlConfig("hive-site.xml",
conf_dir=params.hive_conf_dir,
configurations=params.config['configurations']['hive-site'],
configuration_attributes=params.config['configuration_attributes']['hive-site'],
owner=params.oozie_user,
group=params.user_group,
- mode=0644)
- if params.config['configurations']['tez-site']:
+ mode=0644
+ )
+ if 'tez-site' in params.config['configurations']:
XmlConfig( "tez-site.xml",
conf_dir = params.hive_conf_dir,
configurations = params.config['configurations']['tez-site'],
@@ -180,6 +181,6 @@ def oozie_server_specific():
owner = params.oozie_user,
group = params.user_group,
mode = 0664
- )
+ )
pass
[2/2] git commit: AMBARI-8116. Installing Oozie without Hive or Tez
fails the deploy (aonishuk)
Posted by ao...@apache.org.
AMBARI-8116. Installing Oozie without Hive or Tez fails the deploy (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0311fbb1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0311fbb1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0311fbb1
Branch: refs/heads/branch-1.7.0
Commit: 0311fbb17a5388c5175adea4de0f4c05dcd2374b
Parents: 7c5dc8c
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Nov 3 16:55:51 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Nov 3 16:55:51 2014 +0200
----------------------------------------------------------------------
.../HDP/2.0.6/services/OOZIE/package/scripts/oozie.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0311fbb1/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 f33fe81..8f06a3d 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
@@ -164,15 +164,16 @@ def oozie_server_specific():
owner = params.oozie_user,
group = params.user_group
)
- if params.config['configurations']['hive-site']:
+ if 'hive-site' in params.config['configurations']:
XmlConfig("hive-site.xml",
conf_dir=params.hive_conf_dir,
configurations=params.config['configurations']['hive-site'],
configuration_attributes=params.config['configuration_attributes']['hive-site'],
owner=params.oozie_user,
group=params.user_group,
- mode=0644)
- if params.config['configurations']['tez-site']:
+ mode=0644
+ )
+ if 'tez-site' in params.config['configurations']:
XmlConfig( "tez-site.xml",
conf_dir = params.hive_conf_dir,
configurations = params.config['configurations']['tez-site'],
@@ -180,6 +181,6 @@ def oozie_server_specific():
owner = params.oozie_user,
group = params.user_group,
mode = 0664
- )
+ )
pass