openstack
/
fuel-library
Code Issues Proposed changes

cs dependency

This commit is contained in:
Andrey Korolyov 2013-10-02 17:24:47 +04:00
parent 7e240e59e4
commit 07ec9748df
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,16 +114,15 @@ class corosync (
}
}
if $::operatingsystem == 'Ubuntu' {
file { "/etc/init/corosync.override":
file { "/etc/init/corosync.override":
replace => "no",
ensure => "present",
content => "manual",
mode => 644,
} ->
package { ['corosync', 'pacemaker']: ensure => present }
} else {
package { ['corosync', 'pacemaker']: ensure => present }
}
before => Package[corosync],
}
}
package { ['corosync', 'pacemaker']: ensure => present }
if $::osfamily == "RedHat"
{
@ -181,7 +180,6 @@ class corosync (
exec { 'rm_corosync_override':
command => '/bin/rm -f /etc/init/corosync.override',
path => ['/bin', '/usr/bin'],
require => File['/etc/corosync/corosync.conf'],
}
}
}