opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #790 from cadeauthom/service-unmanaged

Browse source 
Move all dependencies to not have them in case of service unmanaged
This commit is contained in:
David Schmitt 2016-01-08 10:35:16 +00:00
commit 1cfddec3ff
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
manifests/server/service.pp
View file

@ -33,34 +33,34 @@ class mysql::server::service {
enable => $mysql::server::real_service_enabled, enable => $mysql::server::real_service_enabled,
provider => $mysql::server::service_provider, provider => $mysql::server::service_provider,
} }
}
# only establish ordering between service and package if # only establish ordering between service and package if
# we're managing the package. # we're managing the package.
if $mysql::server::package_manage { if $mysql::server::package_manage {
Service['mysqld'] { Service['mysqld'] {
require => Package['mysql-server'], require => Package['mysql-server'],
}
}
# only establish ordering between config file and service if
# we're managing the config file.
if $mysql::server::manage_config_file {
File['mysql-config-file'] -> Service['mysqld']
}
if $mysql::server::override_options and $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['socket'] {
$mysqlsocket = $mysql::server::override_options['mysqld']['socket']
} else {
$mysqlsocket = $options['mysqld']['socket']
}
exec { 'wait_for_mysql_socket_to_open':
command => "test -S ${mysqlsocket}",
unless => "test -S ${mysqlsocket}",
tries => '3',
try_sleep => '10',
require => Service['mysqld'],
path => '/bin:/usr/bin',
} }
} }
# only establish ordering between config file and service if
# we're managing the config file.
if $mysql::server::manage_config_file {
File['mysql-config-file'] -> Service['mysqld']
}
if $mysql::server::override_options and $mysql::server::override_options['mysqld'] and $mysql::server::override_options['mysqld']['socket'] {
$mysqlsocket = $mysql::server::override_options['mysqld']['socket']
} else {
$mysqlsocket = $options['mysqld']['socket']
}
exec { 'wait_for_mysql_socket_to_open':
command => "test -S ${mysqlsocket}",
unless => "test -S ${mysqlsocket}",
tries => '3',
try_sleep => '10',
require => Service['mysqld'],
path => '/bin:/usr/bin',
}
} }