Author: smohanty
Date: Sat Apr 13 04:26:43 2013
New Revision: 1467542
URL: http://svn.apache.org/r1467542
Log:
AMBARI-1925. Remove hadoop_deploy user. (smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467542&r1=1467541&r2=1467542&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Apr 13 04:26:43 2013
@@ -713,6 +713,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1925. Remove "hadoop_deploy" user. (smohanty)
+
AMBARI-1915. Client install tasks are shown twice in install progress
popup. (swagle)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1467542&r1=1467541&r2=1467542&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
Sat Apr 13 04:26:43 2013
@@ -197,8 +197,9 @@ class hdp-ganglia::service::change_permi
{
if ($ensure == 'running' or $ensure == 'installed_and_configured') {
hdp::directory_recursive_create { '/var/lib/ganglia/dwoo' :
- mode => '0777'
- }
+ mode => '0777',
+ owner => $hdp-ganglia::params::gmetad_user
+ }
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp?rev=1467542&r1=1467541&r2=1467542&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/params.pp
Sat Apr 13 04:26:43 2013
@@ -23,4 +23,6 @@ class hdp-mysql::params() inherits hdp-h
$db_name = "$hdp-hive::params::hive_database_name"
$db_user = $hdp-hive::params::hive_metastore_user_name
$db_pw = $hdp-hive::params::hive_metastore_user_passwd
+ $mysql_user = hdp_default("mysql_user","mysql")
+ $mysql_group = hdp_default("mysql_group","mysql")
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp?rev=1467542&r1=1467541&r2=1467542&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
Sat Apr 13 04:26:43 2013
@@ -43,7 +43,9 @@ class hdp-mysql::server(
# On Suse, creating symlink from default mysqld pid file to expected
/var/run location
hdp::directory_recursive_create {'/var/run/mysqld/':
- require => Hdp::Package['mysql']
+ require => Hdp::Package['mysql'],
+ owner => $mysql_user,
+ group => $mysql_group
}
file { '/var/run/mysqld/mysqld.pid':
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp?rev=1467542&r1=1467541&r2=1467542&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-pig/manifests/init.pp
Sat Apr 13 04:26:43 2013
@@ -50,6 +50,7 @@ class hdp-pig(
hdp::directory { $pig_config_dir:
service_state => $service_state,
force => true,
+ owner => $hdp::params::hdfs_user,
group => $hdp::params::user_group,
override_owner => true
}
@@ -66,7 +67,8 @@ class hdp-pig(
define hdp-pig::configfile()
{
hdp::configfile { "${hdp::params::pig_conf_dir}/${name}":
- component => 'pig'
+ component => 'pig',
+ owner => $hdp::params::hdfs_user
}
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp?rev=1467542&r1=1467541&r2=1467542&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
Sat Apr 13 04:26:43 2013
@@ -68,10 +68,6 @@ class hdp(
#TODO: think not needed and also there seems to be a puppet bug around this
and ldap
- hdp::user { $hdp::params::hadoop_user:
- gid => $hdp::params::user_group
- }
- Group[$hdp::params::user_group] -> Hdp::User[$hdp::params::hadoop_user]
class { 'hdp::snmp': service_state => 'running'}
class { 'hdp::create_smoke_user': }
@@ -211,7 +207,7 @@ define hdp::user(
define hdp::directory(
- $owner = $hdp::params::hadoop_user,
+ $owner = undef,
$group = $hdp::params::user_group,
$mode = undef,
$ensure = directory,
@@ -248,7 +244,7 @@ define hdp::directory(
}
#TODO: check on -R flag and use of recurse
define hdp::directory_recursive_create(
- $owner = $hdp::params::hadoop_user,
+ $owner = undef,
$group = $hdp::params::user_group,
$mode = undef,
$context_tag = undef,
@@ -277,7 +273,7 @@ define hdp::directory_recursive_create(
}
define hdp::directory_recursive_create_ignore_failure(
- $owner = $hdp::params::hadoop_user,
+ $owner = undef,
$group = $hdp::params::user_group,
$mode = undef,
$context_tag = undef,
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1467542&r1=1467541&r2=1467542&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Sat Apr 13 04:26:43 2013
@@ -167,12 +167,6 @@ class hdp::params()
$webhcat_apps_dir = hdp_default("webhcat_apps_dir", "/apps/webhcat")
$hbase_hdfs_root_dir =
hdp_default("hadoop/hbase-site/hbase_hdfs_root_dir","/apps/hbase/data")
- #because of Puppet user resource issue make sure that $hadoop_user is
different from user_group
- if ($security_enabled == true) {
- $hadoop_user = "root"
- } else {
- $hadoop_user = hdp_default("hadoop_user", "hadoop_deploy")
- }
$user_group = hdp_default("user_group","hadoop")
$ganglia_enabled = hdp_default("ganglia_enabled",true)
