x
/
openstack-resource-agents
Code Issues Proposed changes

fix 'evacute' typo 

This requires the same fix to be applied to fence_compute:

  https://github.com/ClusterLabs/fence-agents/pull/27

and is a more complete version of

  33154a6680

which only patched NovaEvacuate and not NovaCompute.

Signed-off-by: Adam Spiers <aspiers@suse.com>

Change-Id: Iea778d6455341275303e592a09bca7d6db120950
This commit is contained in:
Adam Spiers 2015-11-18 17:10:08 +00:00
parent ebe80c5830
commit bb71d6f7d3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ocf/NovaCompute
View File

@ -159,7 +159,7 @@ nova_start() {
return $OCF_SUCCESS
fi
state=$(attrd_updater -p -n evacute -N ${NOVA_HOST} | sed -e 's/.*value=//' | tr -d '"' )
state=$(attrd_updater -p -n evacuate -N ${NOVA_HOST} | sed -e 's/.*value=//' | tr -d '"' )
if [ "x$state" = x ]; then
: never been fenced
@ -171,7 +171,7 @@ nova_start() {
else
ocf_log info "Waiting for pending evacuations from ${NOVA_HOST}"
while [ "x$state" != "xno" ]; do
state=$(attrd_updater -p -n evacute -N ${NOVA_HOST} | sed -e 's/.*value=//' | tr -d '"' )
state=$(attrd_updater -p -n evacuate -N ${NOVA_HOST} | sed -e 's/.*value=//' | tr -d '"' )
sleep 5
done

4
ocf/NovaEvacuate
View File

@ -141,7 +141,7 @@ evacuate_start() {
}
update_evacuation() {
attrd_updater -p -n evacute -Q -N ${1} -v ${2}
attrd_updater -p -n evacuate -Q -N ${1} -v ${2}
arc=$?
if [ ${arc} != 0 ]; then
ocf_log warn "Can not set evacuation state of ${1} to ${2}: ${arc}"
@ -219,7 +219,7 @@ evacuate_monitor() {
return $OCF_NOT_RUNNING
fi
handle_evacuations $(attrd_updater -n evacute -A | tr '="' ' ' | awk '{print $4" "$6}')
handle_evacuations $(attrd_updater -n evacuate -A | tr '="' ' ' | awk '{print $4" "$6}')
return $OCF_SUCCESS
}