You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by hi...@apache.org on 2012/05/18 07:24:52 UTC
svn commit: r1339976 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
hmc/puppet/modules/hdp/manifests/init.pp
hmc/puppet/modules/hdp/manifests/params.pp
Author: hitesh
Date: Fri May 18 05:24:50 2012
New Revision: 1339976
URL: http://svn.apache.org/viewvc?rev=1339976&view=rev
Log:
AMBARI-272. Remove occurrences of repo_url to support local yum repo. Contributed by Ramya
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.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=1339976&r1=1339975&r2=1339976&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri May 18 05:24:50 2012
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.x.x - unreleased
+ AMBARI-272. Remove occurrences of repo_url to support local yum repo (Ramya via hitesh)
+
AMBARI-271. Support for local yum mirror (Hitesh via ramya)
AMBARI-270. Puppet cleanup to define all the users in a common
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp?rev=1339976&r1=1339975&r2=1339976&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp Fri May 18 05:24:50 2012
@@ -18,6 +18,7 @@ class hdp-sqoop::mysql-connector()
exec{ "unzip sqoop_mysql_url":
command => "unzip -o -j ${target}",
cwd => $sqoop_lib,
+ #user => $hdp::params::sqoop_user,
group => $hdp::params::hadoop_user_group,
creates => "${sqoop_lib}/${$zip_name}",
path => ["/usr/bin/"]
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp?rev=1339976&r1=1339975&r2=1339976&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/init.pp Fri May 18 05:24:50 2012
@@ -13,10 +13,6 @@ class hdp()
}
Group[$hdp::params::hadoop_user_group] -> Hdp::User[$hdp::params::hadoop_user]
- class { 'hdp::package::epel_rpm' :}
-
- class { 'hdp::set_hdp_yum_repo': }
-
class { 'hdp::snmp': service_state => 'running'}
class { 'hdp::create_smoke_user': }
@@ -44,16 +40,6 @@ class hdp()
}
-class hdp::set_hdp_yum_repo()
-{
- $repo_target = "/etc/yum.repos.d/${hdp::params::hdp_yum_repo}"
- hdp::configfile { $repo_target:
- component => 'base',
- owner => 'root',
- group => 'root'
- }
-}
-
class hdp::create_smoke_user()
{
$smoke_group = $hdp::params::smoke_user_group
@@ -85,17 +71,6 @@ class hdp::set_selinux()
}
}
-class hdp::package::epel_rpm()
-{
- $epel_url = $hdp::params::epel_url
- $epel_package = regsubst($epel_url,'^.+/(.+)\.noarch\.rpm','\1')
- $cmd = "rpm -Uvh ${epel_url}"
- hdp::exec{ $cmd:
- command => $cmd,
- unless => "rpm -qa | grep $epel_package"
- }
-}
-
define hdp::user(
$gid = $hdp::params::hadoop_user_group,
$just_validate = undef
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=1339976&r1=1339975&r2=1339976&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 Fri May 18 05:24:50 2012
@@ -133,12 +133,8 @@ class hdp::params()
### artifact dir
$artifact_dir = hdp_default("artifact_dir","/tmp/HDP-artifacts/")
- #### epel ##
- $epel_url = hdp_default("epel_url","http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm")
-
### artifacts download url ##
- $hdp_repo_url = hdp_default("hdp_repo_url","")
- $apache_artifacts_download_url = "${hdp_repo_url}/tars"
+ $apache_artifacts_download_url = hdp_default("apache_artifacts_download_url","")
$gpl_artifacts_download_url = hdp_default("gpl_artifacts_download_url","")
### related to package resources
@@ -223,10 +219,8 @@ class hdp::params()
}
$packages = 'bigtop'
if ($packages == 'hdp') {
- $hdp_yum_repo_base_url = hdp_default("hdp_yum_repo_base_url","")
$package_names[hadoop] = { 32 => ['hadoop.i386'], 64 => ['hadoop.x86_64']}
$mapred_smoke_test_script = "/usr/sbin/hadoop-validate-setup.sh"
- $hdp_yum_repo = hdp_default("hdp_yum_repo","hdp103.repo")
$hadoop_bin = "/usr/sbin"
$hadoop_conf_dir = "/etc/hadoop"
$zk_conf_dir = "/etc/zookeeper"
@@ -251,13 +245,11 @@ class hdp::params()
$hcat_mysql_host = hdp_default("hcat_mysql_host")
} elsif ($packages == 'bigtop') {
- $hdp_yum_repo_base_url = "${hdp_repo_url}"
$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.i386','hadoop-native.i386'], 64 => ['hadoop.x86_64','hadoop-native.x86_64']}
$mapred_smoke_test_script = "/usr/lib/hadoop/sbin/hadoop-validate-setup.sh"
- $hdp_yum_repo = hdp_default("hdp_yum_repo","hdp103.repo")
$hadoop_bin = "/usr/lib/hadoop/bin"
$hadoop_conf_dir = "/etc/hadoop/conf"
$zk_conf_dir = "/etc/zookeeper/conf"