incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1345403 - in /incubator/ambari/branches/ambari-186: ./ hmc/puppet/modules/hdp-dashboard/manifests/ hmc/puppet/modules/hdp-ganglia/manifests/ hmc/puppet/modules/hdp-nagios/manifests/server/ hmc/puppet/modules/hdp/manifests/
Date Sat, 02 Jun 2012 00:27:54 GMT
Author: vikram
Date: Sat Jun  2 00:27:53 2012
New Revision: 1345403

URL: http://svn.apache.org/viewvc?rev=1345403&view=rev
Log:
AMBARI-318. Do not install the packages that install init.d scripts (Contributed by Ramya)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/manifests/init.pp
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1345403&r1=1345402&r2=1345403&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Sat Jun  2 00:27:53 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-318. Do not install the packages that install init.d scripts (Ramya via Vikram).
+
   AMBARI-304. Upgrade to yui-3.5.1. Manage Services commit (Vinod via Vikram)
 
   AMBARI-315. reconfig a service should a list of dependent services that will be restarted
as a result (Vinod via Vikram).

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/manifests/init.pp?rev=1345403&r1=1345402&r2=1345403&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/manifests/init.pp
(original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-dashboard/manifests/init.pp
Sat Jun  2 00:27:53 2012
@@ -7,6 +7,7 @@ class hdp-dashboard(
    } elsif ($service_state == 'uninstalled') {
     hdp::package { 'dashboard' :
       ensure => 'uninstalled',
+      java_needed = 'false',
       size   => 64
     }
     hdp::directory_recursive_create { $conf_dir :
@@ -18,6 +19,7 @@ class hdp-dashboard(
 
    } elsif ($service_state in ['running','installed_and_configured','stopped']) {
       hdp::package { 'dashboard' :
+        java_needed = 'false',
         size => 64
        }
      $conf_dir =  $hdp-dashboard::params::conf_dir

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp?rev=1345403&r1=1345402&r2=1345403&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp
(original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/init.pp
Sat Jun  2 00:27:53 2012
@@ -14,10 +14,13 @@ class hdp-ganglia(
   if ($service_state == 'no_op') {
    } elsif ($service_state == 'uninstalled') {
     hdp::package { 'ganglia-monitor' :
+      java_needed = 'false',
       ensure => 'uninstalled'
     }
    } elsif ($service_state in ['running','installed_and_configured','stopped']) {
-      hdp::package { 'ganglia-monitor':}
+      hdp::package { 'ganglia-monitor':
+        java_needed = 'false'
+      }
 
   } 
 

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1345403&r1=1345402&r2=1345403&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp
(original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-ganglia/manifests/server.pp
Sat Jun  2 00:27:53 2012
@@ -92,6 +92,7 @@ class hdp-ganglia::server::packages(
 )
 {
   hdp::package { ['ganglia-server','ganglia-gweb','ganglia-hdp-gweb-addons']:
+    java_needed = 'false',
     ensure => $ensure
  } 
 }

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp?rev=1345403&r1=1345402&r2=1345403&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp
(original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp
Sat Jun  2 00:27:53 2012
@@ -5,11 +5,12 @@ class hdp-nagios::server::packages(
   if ($service_state == 'no_op') {
   } elsif ($service_state in ['uninstalled']) {
      hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-net-snmp-utils','nagios-addons']:
-    ensure => 'uninstalled'
-  }
+      java_needed => false,
+      ensure => 'uninstalled'
+    }
   } elsif ($service_state in ['running','stopped','installed_and_configured']) {
      hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-net-snmp-utils','nagios-addons','nagios-php-pecl-json']:

-  }
+   }
   } 
   Hdp-nagios::Server::Package['nagios-plugins'] -> Hdp::Package['nagios-addons'] #other
order produces package conflict
 

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp?rev=1345403&r1=1345402&r2=1345403&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp Sat Jun
 2 00:27:53 2012
@@ -204,8 +204,8 @@ class hdp::params()
       64 => 'oozie.noarch'
     },
     lzo => {
-      32 => ['lzo.i386','lzo-devel.i386'],
-      64 => ['lzo','lzo-devel']
+      32 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386'],
+      64 => ['lzo','lzo.i386','lzo-devel','lzo-devel.i386']
     },
     #TODO: make these two consistent on whether case of 64/32 bits
     snappy => {
@@ -245,7 +245,7 @@ class hdp::params()
 
   } elsif ($packages == 'bigtop') {  
 
-    $package_names[hadoop] = {32 => ['hadoop','hadoop-libhdfs.i386','hadoop-native.i386','hadoop-pipes.i386','hadoop-sbin.i386','hadoop-datanode','hadoop-jobtracker','hadoop-secondarynamenode','hadoop-tasktracker'],
64 => ['hadoop','hadoop-libhdfs.x86_64','hadoop-native.x86_64','hadoop-pipes.x86_64','hadoop-sbin.x86_64','hadoop-datanode','hadoop-jobtracker','hadoop-secondarynamenode','hadoop-tasktracker']}
+    $package_names[hadoop] = {32 => ['hadoop','hadoop-libhdfs.i386','hadoop-native.i386','hadoop-pipes.i386','hadoop-sbin.i386'],
64 => ['hadoop','hadoop-libhdfs.x86_64','hadoop-native.x86_64','hadoop-pipes.x86_64','hadoop-sbin.x86_64']}
     #$package_names[hadoop] = {32 => ['hadoop.i386','hadoop-native.i386'], 64 => ['hadoop.x86_64','hadoop-native.x86_64']}
    
     $mapred_smoke_test_script = "/usr/lib/hadoop/sbin/hadoop-validate-setup.sh"
@@ -261,12 +261,12 @@ class hdp::params()
     $hadoop_jar_location = "/usr/lib/hadoop/"
     $hbase_daemon_script = "/usr/lib/hbase/bin/hbase-daemon.sh"
     $use_32_bits_on_slaves = true
-    $package_names[zookeeper] = {64 => ['zookeeper-server','zookeeper']}
-    $package_names[hbase] = {64 => ['hbase','hbase-doc','hbase-thrift','hbase-rest']}
-    $package_names[sqoop] = {32 => ['sqoop-metastore','sqoop']}
+    $package_names[zookeeper] = {64 => ['zookeeper']}
+    $package_names[hbase] = {64 => ['hbase']}
+    $package_names[sqoop] = {32 => ['sqoop']}
     $package_names[pig] = {32 => ['pig.noarch']}
     $package_names[hcat] = {32 => ['hcatalog']}
-    $package_names[hive] = {64 => ['hive-server','hive','hive-metastore']}
+    $package_names[hive] = {64 => ['hive']}
     $zk_bin = '/usr/lib/zookeeper/bin'
     $zk_smoke_test_script = "/usr/lib/zookeeper/bin/zkCli.sh"
     $update_zk_shell_files = false



Mime
View raw message