Fix mysql resource name in check_mysql helpers

Pacemaker resource was renamed from clone_p_mysql to clone_p_mysqld

Change-Id: I092f0e39d27ec6ae9b167f6ba34ff2d07248c2f9
Closes-Bug: #1548439
This commit is contained in:
Artem Grechanichenko 2016-02-22 21:20:00 +02:00
parent 5372f8cd78
commit f57997fe86
2 changed files with 3 additions and 3 deletions

View File

@ -351,7 +351,7 @@ def iptables_check(remote):
@logwrap
def check_mysql(remote, node_name):
check_cmd = 'pkill -0 -x mysqld'
check_crm_cmd = ('crm resource status clone_p_mysql |'
check_crm_cmd = ('crm resource status clone_p_mysqld |'
' grep -q "is running on: $HOSTNAME"')
check_galera_cmd = ("mysql --connect_timeout=5 -sse \"SELECT"
" VARIABLE_VALUE FROM"

View File

@ -446,9 +446,9 @@ class TestHaFailoverBase(TestBasic):
pcm_nodes), config), None,
'Some of [heat*] engine resources are not properly configured')
assert_not_equal(re.search(
"Clone Set: clone_p_mysql \[p_mysql\]\s+Started:"
"Clone Set: clone_p_mysqld \[p_mysqld\]\s+Started:"
" \[ {0} \]".format(pcm_nodes), config), None,
'Resource [p_mysql] is not properly configured')
'Resource [p_mysqld] is not properly configured')
assert_not_equal(re.search(
"Clone Set: clone_p_haproxy \[p_haproxy\]\s+Started:"
" \[ {0} \]".format(pcm_nodes), config), None,