openstack
/
fuel-library
Code Issues Proposed changes

Ensure corosync files & packages 

In Ubuntu 16.04 corosync package is
splitted. "fuel-rabbit-fence" package
needs "notifyd"-part, so depends are
updated.

* ensure corosync necessary directories
* don't run sed on Ubuntu 16.04

blueprint: mos-xenial

Closes-bug: #1587075

Change-Id: I241a7976ad0c347167938a3b2656f633bc988046
This commit is contained in:
dmburmistrov 2016-05-27 16:19:17 +03:00 committed by Dmitry Burmistrov
parent 4cf740401c
commit 16f345bd2b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -47,7 +47,7 @@ Description: Misc Fuel library scripts
Package: fuel-rabbit-fence
Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}, dbus, python-gobject-2, python-gobject, python-dbus, python-daemon, rabbitmq-server
Depends: ${misc:Depends}, ${shlibs:Depends}, dbus, python-gobject-2, python-gobject, python-dbus, python-daemon, rabbitmq-server, corosync-notifyd
Description: Fuel RabbitMQ fencing utilitites
.

8
deployment/puppet/cluster/manifests/rabbitmq_fence.pp
View File

@ -52,13 +52,15 @@ class cluster::rabbitmq_fence(
enable => true,
} ->
# This package brings all necessary packages for services.
# So it is installed first.
package { 'fuel-rabbit-fence': } ->
service { 'corosync-notifyd':
ensure => running,
enable => true,
} ->
package { 'fuel-rabbit-fence': } ->
file { '/etc/rabbitmq/node_name_prefix_for_messaging':
ensure => file,
mode => '0644',
@ -76,7 +78,7 @@ class cluster::rabbitmq_fence(
require => Package['rabbitmq-server'],
}
if $::osfamily == 'Debian' {
if $::osfamily == 'Debian' and $::operatingsystemrelease =~ /^14/ {
Exec {
path => [ '/bin', '/usr/bin' ],
before => Service['corosync-notifyd'],

7
deployment/puppet/osnailyfacter/manifests/cluster/cluster.pp
View File

@ -48,11 +48,14 @@ class osnailyfacter::cluster::cluster {
$pacemaker_run_uid = 'hacluster'
$pacemaker_run_gid = 'haclient'
file {'/etc/corosync/uidgid.d/': ensure => directory }
file {'/etc/corosync/uidgid.d/pacemaker':
content =>"uidgid {
content => "uidgid {
uid: ${pacemaker_run_uid}
gid: ${pacemaker_run_gid}
}"
}",
require => File['/etc/corosync/uidgid.d/']
}
File['/etc/corosync/corosync.conf'] -> File['/etc/corosync/uidgid.d/pacemaker'] -> Service <| title == 'corosync' |>