openstack/fuel-library
Code Issues Proposed changes

Merge "remove restart of Galera, mysql and pacemaker/corosync services"

Browse Source
This commit is contained in:
Jenkins 2014-04-08 17:24:56 +00:00 committed by Gerrit Code Review
commit 9056ddfb10
4 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deployment/puppet/corosync/manifests/init.pp
View File

@ -124,27 +124,12 @@ class corosync (
}
package {'python-pcs': ensure => present} ->
Package['pacemaker']
Package<|title == 'python-pcs'|> ~> Service<|title == 'corosync'|>
if !defined(Service['corosync']) {
notify{ "Module ${module_name} cannot notify service corosync\
on package python-pcs update": }
}
} else {
package {'pcs': ensure => present} ->
package {'crmsh': ensure => present} ->
Package['pacemaker']
Package<|title == 'pcs'|> ~> Service<|title == 'corosync'|>
if !defined(Service['corosync']) {
notify{ "Module ${module_name} cannot notify service corosync\
on package pcs update": }
}
}
package { ['corosync', 'pacemaker']: ensure => present }
Package<|title == 'corosync' or title == 'pacemaker'|> ~> Service<|title == 'corosync'|>
if !defined(Service['corosync']) {
notify{ "Module ${module_name} cannot notify service corosync\
on packages update": }
}
# Template uses:
# - $unicast_addresses

4
deployment/puppet/galera/manifests/init.pp
View File

@ -231,10 +231,6 @@ class galera (
provider => $::galera::params::pkg_provider,
require => Package['galera']
}
Package<| title == 'MySQL-server'|> ~> Service<| title == 'mysql'|>
if !defined(Service['mysql']) {
notify{ "Module ${module_name} cannot notify service mysql on package MySQL-server update": }
}
package { "galera":
ensure => present,

5
deployment/puppet/haproxy/manifests/init.pp
View File

@ -83,10 +83,7 @@ class haproxy (
Package['haproxy'] ->
Class['haproxy::base'] ->
Haproxy::Service <||>
Package<| title == 'haproxy'|> ~> Haproxy::Service <||>
if !defined(Service['mysql']) {
notify{ "Module ${module_name} cannot notify its services on package update": }
}
if $manage_service {
Class['haproxy::base'] -> Service['haproxy']

5
deployment/puppet/mysql/manifests/server.pp
View File

@ -201,10 +201,7 @@ class mysql::server (
require => [Package['mysql-server'], Cs_commit['mysql']],
provider => 'pacemaker',
}
Package<| title == 'mysql-server'|> ~> Service<| title == 'mysql'|>
if !defined(Service['mysql']) {
notify{ "Module ${module_name} cannot notify service mysql on package update": }
}
#Tie vip__management_old to p_mysqld
cs_colocation { 'mysql_to_internal-vip':