openstack/fuel-library
Code Issues Proposed changes

Hotfix: Add pcs utility, add ordering for crmsh package

Browse Source 
Change-Id: I15a6dd784282383e605a57049f94820972e5d03b
This commit is contained in:
Sergey Vasilenko 2014-02-20 17:32:52 +04:00
parent 35299a0aa5
commit 157197ab6b
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,8 +99,8 @@ class corosync (
mode => '0644', mode => '0644',
before => Service["corosync"], before => Service["corosync"],
} }
# Using the Puppet infrastructure's ca as the authkey, this means any node in # Using the Puppet infrastructure's ca as the authkey, this means any node in
# Puppet can join the cluster. Totally not ideal, going to come up with # Puppet can join the cluster. Totally not ideal, going to come up with
# something better. # something better.
@ -115,21 +115,22 @@ class corosync (
} }
} }
if $::operatingsystem == 'Ubuntu' { if $::operatingsystem == 'Ubuntu' {
file { "/etc/init/corosync.override": file { "/etc/init/corosync.override":
replace => "no", replace => "no",
ensure => "present", ensure => "present",
content => "manual", content => "manual",
mode => '0644', mode => '0644',
before => Package[corosync], before => Package[corosync],
} }
package {'python-pcs': ensure => present} ->
Package['pacemaker']
} else {
package {'pcs': ensure => present} ->
package {'crmsh': ensure => present} ->
Package['pacemaker']
} }
package { ['corosync', 'pacemaker']: ensure => present } package { ['corosync', 'pacemaker']: ensure => present }
if $::osfamily == "RedHat"
{
package {'crmsh': ensure => present}
}
# Template uses: # Template uses:
# - $unicast_addresses # - $unicast_addresses
# - $multicast_address # - $multicast_address
@ -182,7 +183,7 @@ class corosync (
command => '/bin/rm -f /etc/init/corosync.override', command => '/bin/rm -f /etc/init/corosync.override',
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
} }
} }
} }
@ -212,5 +213,5 @@ class corosync (
enable => true, enable => true,
subscribe => File[['/etc/corosync/corosync.conf', '/etc/corosync/service.d']], subscribe => File[['/etc/corosync/corosync.conf', '/etc/corosync/service.d']],
} }
} }