AMBARI-2044. hive-site.xml permission denied exception. (swagle)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1477755 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -818,6 +818,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2044. hive-site.xml permission denied exception. (swagle)
+
  AMBARI-2057. Gmond left in init after install. (smohanty)
 
  AMBARI-2051. Remove hard-coded ports from agent scripts - Nagios. (swagle)

ambari-agent/src/main/puppet/modules/hdp-hive/manifests/init.pp

@@ -48,17 +48,6 @@ class hdp-hive(
     }
   }
 
-  $inited_nagios_user = hdp_user("nagios_user")
-
-  if ($inited_nagios_user != undef and $service_state in ['running','stopped','installed_and_configured']) {
-    exec { 'add_permissions_for_nagios_user':
-      command => "setfacl -m user:${inited_nagios_user}:r-- ${hdp::params::hive_conf_dir}/hive-site.xml",
-      onlyif  => "getent passwd ${inited_nagios_user} >/dev/null",
-      path    => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
-      require => Configgenerator::Configfile['hive-site']
-    }
-  }
-
   anchor { 'hdp-hive::begin': }
   anchor { 'hdp-hive::end': } 
 

ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server.pp

@@ -210,14 +210,20 @@ class hdp-nagios::server(
 
     class { 'hdp-nagios::server::services': ensure => $service_state}
 	
-	
-	Class['hdp-nagios::server::packages'] -> Class['hdp-nagios::server::enable_snmp']-> 
-	Group[$nagios_group] -> Hdp::User[$nagios_user] ->
-	Hdp::Directory[$nagios_config_dir] -> Hdp::Directory[$plugins_dir] -> Hdp::Directory_recursive_create[$nagios_pid_dir] ->
-	Hdp::Directory[$nagios_obj_dir] -> Hdp::Directory_Recursive_Create[$nagios_var_dir] ->
-	Hdp::Directory_Recursive_Create[$check_result_path] -> Hdp::Directory_Recursive_Create[$nagios_rw_dir] ->
-	Hdp::Directory[$nagios_log_dir] -> Hdp::Directory[$nagios_log_archives_dir] ->
-	Class['hdp-nagios::server::config'] -> Class['hdp-nagios::server::web_permisssions'] -> File["$nagios_config_dir/command.cfg"] -> Class['hdp-nagios::server::services'] -> Class['hdp-monitor-webserver']
+    exec { 'add_permissions_to_hive_site':
+      command => "setfacl -m user:${nagios_user}:r-- ${hdp::params::hive_conf_dir}/hive-site.xml",
+      onlyif  => "[ -f ${hdp::params::hive_conf_dir}/hive-site.xml ]",
+      path    => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'
+    }
+
+    Class['hdp-nagios::server::packages'] -> Class['hdp-nagios::server::enable_snmp']->
+    Group[$nagios_group] -> Hdp::User[$nagios_user] -> Exec['add_permissions_to_hive_site'] ->
+    Hdp::Directory[$nagios_config_dir] -> Hdp::Directory[$plugins_dir] -> Hdp::Directory_recursive_create[$nagios_pid_dir] ->
+    Hdp::Directory[$nagios_obj_dir] -> Hdp::Directory_Recursive_Create[$nagios_var_dir] ->
+    Hdp::Directory_Recursive_Create[$check_result_path] -> Hdp::Directory_Recursive_Create[$nagios_rw_dir] ->
+    Hdp::Directory[$nagios_log_dir] -> Hdp::Directory[$nagios_log_archives_dir] ->
+    Class['hdp-nagios::server::config'] -> Class['hdp-nagios::server::web_permisssions'] ->
+    File["$nagios_config_dir/command.cfg"] -> Class['hdp-nagios::server::services'] -> Class['hdp-monitor-webserver']
 
   } else {
     hdp_fail("TODO not implemented yet: service_state = ${service_state}")