You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by tb...@apache.org on 2015/05/05 22:25:15 UTC
ambari git commit: AMBARI-10936 - Prepare oozie war should check for
secure. (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk 03bbb08b5 -> 8a42b232f
AMBARI-10936 - Prepare oozie war should check for secure. (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a42b232
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a42b232
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a42b232
Branch: refs/heads/trunk
Commit: 8a42b232f0971559161a505e30291cd5a353e6b4
Parents: 03bbb08
Author: tbeerbower <tb...@hortonworks.com>
Authored: Tue May 5 16:19:38 2015 -0400
Committer: tbeerbower <tb...@hortonworks.com>
Committed: Tue May 5 16:19:47 2015 -0400
----------------------------------------------------------------------
.../common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
.../OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py | 2 +-
.../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 5 +++++
.../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 6 +++---
.../src/test/python/stacks/2.0.6/configs/secured.json | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a42b232/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 77b3cdc..6adf2ac 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -238,7 +238,7 @@ def oozie_server_specific():
not_if = no_op_test,
)
- Execute(format("cd {oozie_tmp_dir} && {oozie_setup_sh} prepare-war"),
+ Execute(format("cd {oozie_tmp_dir} && {oozie_setup_sh} prepare-war {oozie_secure}"),
user = params.oozie_user,
not_if = no_op_test
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a42b232/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
index c4a62ea..c3d9c78 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
@@ -197,7 +197,7 @@ def upgrade_oozie():
Execute(command, user=params.oozie_user)
# prepare the oozie WAR
- command = format("{oozie_setup_sh} prepare-war -d {oozie_libext_customer_dir}")
+ command = format("{oozie_setup_sh} prepare-war {oozie_secure} -d {oozie_libext_customer_dir}")
return_code, oozie_output = shell.call(command)
if return_code != 0 or "New Oozie WAR file with added" not in oozie_output:
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a42b232/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index fb213b1..5875284 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -141,6 +141,11 @@ oozie_log_dir = config['configurations']['oozie-env']['oozie_log_dir']
oozie_data_dir = config['configurations']['oozie-env']['oozie_data_dir']
oozie_server_port = get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
oozie_server_admin_port = config['configurations']['oozie-env']['oozie_admin_port']
+if config['configurations']['oozie-site']['oozie.base.url'].startswith('https'):
+ oozie_secure = '-secure'
+else:
+ oozie_secure = ''
+
fs_root = config['configurations']['core-site']['fs.defaultFS']
if Script.is_hdp_stack_greater_or_equal("2.0") and Script.is_hdp_stack_less_than("2.2"):
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a42b232/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 c706ee7..d0a71c0 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
@@ -214,7 +214,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', 'ambari-sudo.sh chown oozie:hadoop /usr/lib/oozie/libext/falcon-oozie-el-extension-*.jar',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
- self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war',
+ self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war ',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
@@ -471,7 +471,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', 'ambari-sudo.sh chown oozie:hadoop /usr/lib/oozie/libext/falcon-oozie-el-extension-*.jar',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
- self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war',
+ self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war ',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
@@ -627,7 +627,7 @@ class TestOozieServer(RMFTestCase):
self.assertResourceCalled('Execute', 'ambari-sudo.sh chown oozie:hadoop /usr/lib/oozie/libext/falcon-oozie-el-extension-*.jar',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
)
- self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war',
+ self.assertResourceCalled('Execute', 'cd /var/tmp/oozie && /usr/lib/oozie/bin/oozie-setup.sh prepare-war -secure',
not_if = 'ls /var/run/oozie/oozie.pid >/dev/null 2>&1 && ps -p `cat /var/run/oozie/oozie.pid` >/dev/null 2>&1',
user = 'oozie',
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8a42b232/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index 3faf7a1..8319b9f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -97,7 +97,7 @@
"oozie.service.ActionService.executor.ext.classes": "\n org.apache.oozie.action.email.EmailActionExecutor,\n org.apache.oozie.action.hadoop.HiveActionExecutor,\n org.apache.oozie.action.hadoop.ShellActionExecutor,\n org.apache.oozie.action.hadoop.SqoopActionExecutor,\n org.apache.oozie.action.hadoop.DistcpActionExecutor",
"oozie.service.HadoopAccessorService.kerberos.principal": "oozie/c6402.ambari.apache.org@EXAMPLE.COM",
"oozie.service.AuthorizationService.authorization.enabled": "true",
- "oozie.base.url": "http://c6402.ambari.apache.org:11000/oozie",
+ "oozie.base.url": "https://c6402.ambari.apache.org:11000/oozie",
"oozie.service.JPAService.jdbc.password": "asd",
"oozie.service.coord.normal.default.timeout": "120",
"oozie.service.AuthorizationService.security.enabled": "true",