Author: mahadev
Date: Tue Jan 29 17:52:36 2013
New Revision: 1440031
URL: http://svn.apache.org/viewvc?rev=1440031&view=rev
Log:
AMBARI-1291. Incorrect directory for MySQL component on SLES-11.1sp1. (mahadev)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1440031&r1=1440030&r2=1440031&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jan 29 17:52:36 2013
@@ -262,6 +262,9 @@ Trunk (unreleased changes):
AMBARI-1266. Agent checks packages as part of host check but doesn't tell
which ones are needed or conflicting. (mahadev)
+ AMBARI-1291. Incorrect directory for MySQL component on SLES-11.1sp1.
+ (mahadev)
+
AMBARI-1.2.0 branch:
INCOMPATIBLE CHANGES
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=1440031&r1=1440030&r2=1440031&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
Tue Jan 29 17:52:36 2013
@@ -41,10 +41,15 @@ class hdp-mysql::server(
if ($hdp::params::hdp_os_type == "suse") {
# On Suse, creating symlink from default mysqld pid file to expected
/var/run location
- file { '/var/run/mysqld.pid':
- ensure => 'link',
- target => '/var/lib/mysql/mysqld.pid',
- require => Hdp::Package['mysql'],
+
+ hdp::directory_recursive_create {'/var/run/mysqld/':
+ require => Hdp::Package['mysql']
+ }
+
+ file { '/var/run/mysqld/mysqld.pid':
+ ensure => 'link',
+ target => '/var/lib/mysql/mysqld.pid',
+ require => Hdp::Directory_recursive_create['/var/run/mysqld/'],
}
}
@@ -77,7 +82,7 @@ class hdp-mysql::server(
if ($hdp::params::hdp_os_type == "suse") {
service {$service_name:
ensure => $mysqld_state,
- require => File['/var/run/mysqld.pid'],
+ require => File['/var/run/mysqld/mysqld.pid'],
notify => File['/tmp/addMysqlUser.sh']
}
} else {
