incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jiten...@apache.org
Subject svn commit: r1363101 - in /incubator/ambari/trunk: CHANGES.txt hmc/package/rpm/SOURCES/ambari.init.in hmc/php/puppet/genmanifest/PuppetClassDependencies.php hmc/php/util/suggestProperties.php hmc/puppet/modules/hdp-java-jce/
Date Wed, 18 Jul 2012 20:34:06 GMT
Author: jitendra
Date: Wed Jul 18 20:34:05 2012
New Revision: 1363101

URL: http://svn.apache.org/viewvc?rev=1363101&view=rev
Log:
AMBARI-642. Require jce policy file.

Removed:
    incubator/ambari/trunk/hmc/puppet/modules/hdp-java-jce/
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari.init.in
    incubator/ambari/trunk/hmc/php/puppet/genmanifest/PuppetClassDependencies.php
    incubator/ambari/trunk/hmc/php/util/suggestProperties.php

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1363101&r1=1363100&r2=1363101&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Jul 18 20:34:05 2012
@@ -12,6 +12,8 @@ Trunk (unreleased changes)
 
   NEW FEATURES
 
+    AMBARI-642. Require jce policy file. (jitendra)
+
     AMBARI-641. change the nagios status.data file location according to
     platform (vgogate)
 

Modified: incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari.init.in
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari.init.in?rev=1363101&r1=1363100&r2=1363101&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari.init.in (original)
+++ incubator/ambari/trunk/hmc/package/rpm/SOURCES/ambari.init.in Wed Jul 18 20:34:05 2012
@@ -64,9 +64,10 @@ bootPuppet() {
 checkJDK() {
   jdk64="jdk-6u26-linux-x64.bin"
   jdk32="jdk-6u26-linux-i586.bin"
+  jce="jce_policy-6.zip"
 
-  if [[ ! -f /var/run/hmc/downloads/$jdk64 || ! -f /var/run/hmc/downloads/$jdk32 ]]; then
-    echo "Please download $jdk64 and $jdk32 from Oracle to /var/run/hmc/downloads/"
+  if [[ ! -f /var/run/hmc/downloads/$jdk64 || ! -f /var/run/hmc/downloads/$jdk32 || ! -f
/var/run/hmc/downloads/${jce} ]]; then
+    echo "Please download $jdk64, $jdk32 and $jce from Oracle to /var/run/hmc/downloads/"
     exit 1
   fi
 

Modified: incubator/ambari/trunk/hmc/php/puppet/genmanifest/PuppetClassDependencies.php
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/php/puppet/genmanifest/PuppetClassDependencies.php?rev=1363101&r1=1363100&r2=1363101&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/php/puppet/genmanifest/PuppetClassDependencies.php (original)
+++ incubator/ambari/trunk/hmc/php/puppet/genmanifest/PuppetClassDependencies.php Wed Jul
18 20:34:05 2012
@@ -184,9 +184,6 @@ class PuppetClassDependencies {
 
     //Dashboard
     $this->addDependency("hdp-dashboard", SERVICE_STATE_RUNNING, "hdp-dashboard::dashboard::service_check",
array());
-
-    //Kerberos client
-    $this->addDependency("hdp-kerberos::client", SERVICE_STATE_INSTALLED_AND_CONFIGURED,
"hdp-java-jce", array());
   }
 
   private function addDependency($role, $serviceState, $dep, $states) {

Modified: incubator/ambari/trunk/hmc/php/util/suggestProperties.php
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/php/util/suggestProperties.php?rev=1363101&r1=1363100&r2=1363101&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/php/util/suggestProperties.php (original)
+++ incubator/ambari/trunk/hmc/php/util/suggestProperties.php Wed Jul 18 20:34:05 2012
@@ -290,6 +290,7 @@ class SuggestProperties {
     /** TODO change this to be from the UI later **/
     $hostname = strtolower(exec('hostname -f'));
     $result["configs"]["jdk_location"] = "http://".$hostname."/downloads";
+    $result["configs"]["jce_location"] = "http://".$hostname."/downloads";
 
     if ($updateDB) {
       $this->logger->log_info("Updating suggested configs into DB");



Mime
View raw message