openstack/charm-hacluster
Code Issues Proposed changes

Fixup duplicate ping creation

Browse Source
This commit is contained in:
James Page
2014-04-11 11:14:56 +01:00
parent 3c6e764f57
commit 2322becdd6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hooks/hooks.py
View File

@@ -229,15 +229,16 @@ def configure_cluster():
# Configure Ping service
monitor_host = utils.config_get('monitor_host')
if monitor_host:
monitor_interval = utils.config_get('monitor_interval')
cmd = 'crm -w -F configure primitive Ping' \
' ocf:pacemaker:ping params host_list="%s"' \
' multiplier="100" op monitor interval="%s"' %\
(monitor_host, monitor_interval)
cmd2 = 'crm -w -F configure clone PingClone Ping' \
' meta interleave="true"'
pcmk.commit(cmd)
pcmk.commit(cmd2)
if not pcmk.crm_opt_exists('ping'):
monitor_interval = utils.config_get('monitor_interval')
cmd = 'crm -w -F configure primitive ping' \
' ocf:pacemaker:ping params host_list="%s"' \
' multiplier="100" op monitor interval="%s"' %\
(monitor_host, monitor_interval)
cmd2 = 'crm -w -F configure clone cl_ping ping' \
' meta interleave="true"'
pcmk.commit(cmd)
pcmk.commit(cmd2)
# Only configure the cluster resources
# from the oldest peer unit.