openstack
/
charm-hacluster
Code Issues Proposed changes

Fixup for trusty corosync

This commit is contained in:
James Page 2014-03-31 15:34:27 +01:00
parent eea6d3e39b
commit 3b181ba801
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.yaml
View File

@ -6,12 +6,6 @@ options:
Multicast IP address to use for exchanging messages over the network. Multicast IP address to use for exchanging messages over the network.
If multiple clusters are on the same bindnetaddr network, this value If multiple clusters are on the same bindnetaddr network, this value
can be changed. can be changed.
corosync_pcmk_ver:
default: 0
type: int
description: |
Service version for the Pacemaker service version. This will tell
Corosync how to start pacemaker
corosync_key: corosync_key:
type: string type: string
default: "64RxJNcCkwo8EJYBsaacitUvbQp5AW4YolJi5/2urYZYp2jfLxY+3IUCOaAUJHPle4Yqfy+WBXO0I/6ASSAjj9jaiHVNaxmVhhjcmyBqy2vtPf+m+0VxVjUXlkTyYsODwobeDdO3SIkbIABGfjLTu29yqPTsfbvSYr6skRb9ne0=" default: "64RxJNcCkwo8EJYBsaacitUvbQp5AW4YolJi5/2urYZYp2jfLxY+3IUCOaAUJHPle4Yqfy+WBXO0I/6ASSAjj9jaiHVNaxmVhhjcmyBqy2vtPf+m+0VxVjUXlkTyYsODwobeDdO3SIkbIABGfjLTu29yqPTsfbvSYr6skRb9ne0="

13
hooks/hooks.py
View File

@ -113,14 +113,11 @@ def upgrade_charm():
def restart_corosync(): def restart_corosync():
if int(utils.config_get('corosync_pcmk_ver')) == 1: if utils.running("pacemaker"):
if utils.running("pacemaker"): utils.stop("pacemaker")
utils.stop("pacemaker") utils.restart("corosync")
utils.restart("corosync") time.sleep(5)
time.sleep(2) utils.start("pacemaker")
utils.start("pacemaker")
else:
utils.restart("corosync")
HAMARKER = '/var/lib/juju/haconfigured' HAMARKER = '/var/lib/juju/haconfigured'

22
templates/corosync.conf
View File

@ -45,27 +45,23 @@ totem {
} }
} }
amf { quorum {
mode: disabled # Enable and configure quorum subsystem (default: off)
} # see also corosync.conf.5 and votequorum.5
provider: corosync_votequorum
service { expected_votes: 2
# Load the Pacemaker Cluster Resource Manager
ver: {{ corosync_pcmk_ver }}
name: pacemaker
} }
logging { logging {
fileline: off fileline: off
to_stderr: yes to_stderr: yes
to_logfile: no to_logfile: yes
logfile: /var/log/cluster/corosync.log
to_syslog: yes to_syslog: yes
syslog_facility: daemon syslog_facility: daemon
debug: off debug: off
timestamp: on
logger_subsys { logger_subsys {
subsys: AMF subsys: QUORUM
debug: off debug: off
tags: enter|leave|trace1|trace2|trace3|trace4|trace6
} }
} }