You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/03/12 18:49:44 UTC
[1/2] ambari git commit: AMBARI-10040 Falcon service check failed on
secured cluster (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 190bd0b04 -> 832d60529
AMBARI-10040 Falcon service check failed on secured cluster (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/832d6052
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/832d6052
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/832d6052
Branch: refs/heads/trunk
Commit: 832d60529df56218ed5aaa29e0ee1d5c8d60085b
Parents: 4cf5414
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Mar 12 15:40:11 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Mar 12 19:49:07 2015 +0200
----------------------------------------------------------------------
.../common-services/FALCON/0.5.0.2.1/package/scripts/params.py | 1 +
.../FALCON/0.5.0.2.1/package/scripts/service_check.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/832d6052/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
index 13f97ae..49842fa 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/params.py
@@ -92,6 +92,7 @@ hostname = config["hostname"]
hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
hdfs_principal_name = config['configurations']['hadoop-env']['hdfs_principal_name']
+smokeuser_principal = config['configurations']['cluster-env']['smokeuser_principal_name']
kinit_path_local = functions.get_kinit_path()
import functools
#create partial functions with common arguments for every HdfsDirectory call
http://git-wip-us.apache.org/repos/asf/ambari/blob/832d6052/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
index bf3b1dd..f76718b 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
@@ -27,7 +27,7 @@ class FalconServiceCheck(Script):
env.set_params(params)
if params.security_enabled:
- Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smoke_user}"),
+ Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"),
user=params.smoke_user)
Execute(format("{falcon_home}/bin/falcon admin -version"),
user=params.smoke_user,
[2/2] ambari git commit: AMBARI-10038 Add support for Oracle JDK 1.8
(default) (dsen)
Posted by ds...@apache.org.
AMBARI-10038 Add support for Oracle JDK 1.8 (default) (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4cf5414f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4cf5414f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4cf5414f
Branch: refs/heads/trunk
Commit: 4cf5414f5a83459efc983a9c37ac80dee41729e6
Parents: 190bd0b
Author: Dmytro Sen <ds...@apache.org>
Authored: Thu Mar 12 14:56:58 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Thu Mar 12 19:49:07 2015 +0200
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 9 ++++++++-
.../src/main/python/ambari_server/serverConfiguration.py | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cf5414f/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index 251f068..25a4081 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -23,7 +23,7 @@ resources.dir = /var/lib/ambari-server/resources
shared.resources.dir = /usr/lib/ambari-server/lib/ambari_commons/resources
custom.action.definitions = /var/lib/ambari-server/resources/custom_action_definitions
-java.releases=jdk1.7,jdk1.6
+java.releases=jdk1.8,jdk1.7,jdk1.6
jdk1.6.desc=Oracle JDK 1.6
jdk1.6.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-6u31-linux-x64.bin
jdk1.6.dest-file=jdk-6u31-linux-x64.bin
@@ -38,6 +38,13 @@ jdk1.7.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/UnlimitedJCEPoli
jdk1.7.jcpol-file=UnlimitedJCEPolicyJDK7.zip
jdk1.7.home=/usr/jdk64/
jdk1.7.re=(jdk.*)/jre
+jdk1.8.desc=Oracle JDK 1.8
+jdk1.8.url=http://public-repo-1.hortonworks.com/ARTIFACTS/jdk-8u40-linux-x64.tar.gz
+jdk1.8.dest-file=jdk-8u40-linux-x64.tar.gz
+jdk1.8.jcpol-url=http://public-repo-1.hortonworks.com/ARTIFACTS/jce_policy-8.zip
+jdk1.8.jcpol-file=jce_policy-8.zip
+jdk1.8.home=/usr/jdk64/
+jdk1.8.re=(jdk.*)/jre
metadata.path=/var/lib/ambari-server/resources/stacks
common.services.path=/var/lib/ambari-server/resources/common-services
http://git-wip-us.apache.org/repos/asf/ambari/blob/4cf5414f/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index a00be1b..849df56 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -81,10 +81,10 @@ JDK_NAME_PROPERTY = "jdk.name"
JCE_NAME_PROPERTY = "jce.name"
DEFAULT_JDK16_LOCATION = "/usr/jdk64/jdk1.6.0_31"
-JDK_NAMES = ["jdk-7u67-linux-x64.tar.gz", "jdk-6u31-linux-x64.bin"]
+JDK_NAMES = ["jdk-8u40-linux-x64.tar.gz", "jdk-7u67-linux-x64.tar.gz", "jdk-6u31-linux-x64.bin"]
#JCE Policy files
-JCE_POLICY_FILENAMES = ["UnlimitedJCEPolicyJDK7.zip", "jce_policy-6.zip"]
+JCE_POLICY_FILENAMES = ["jce_policy-8.zip", "UnlimitedJCEPolicyJDK7.zip", "jce_policy-6.zip"]
# JDBC
JDBC_PATTERNS = {"oracle": "*ojdbc*.jar", "mysql": "*mysql*.jar"}