Browse Source

AMBARI-1291. Incorrect directory for MySQL component on SLES-11.1sp1. (mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1440031 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar 12 years ago
parent
commit
ce71a9dcb5
2 changed files with 13 additions and 5 deletions
  1. 3 0
      CHANGES.txt
  2. 10 5
      ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp

+ 3 - 0
CHANGES.txt

@@ -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

+ 10 - 5
ambari-agent/src/main/puppet/modules/hdp-mysql/manifests/server.pp

@@ -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 {