diff -uNr a/doc/man/Makefile.am b/doc/man/Makefile.am --- a/doc/man/Makefile.am 2016-02-02 14:49:34.546698286 +0100 +++ b/doc/man/Makefile.am 2016-02-02 14:50:29.893979453 +0100 @@ -73,7 +73,7 @@ ocf_heartbeat_MailTo.7 \ ocf_heartbeat_ManageRAID.7 \ ocf_heartbeat_ManageVE.7 \ - ocf_heartbeat_NovaCompute.7 \ + ocf_heartbeat_nova-compute-wait.7 \ ocf_heartbeat_NovaEvacuate.7 \ ocf_heartbeat_Pure-FTPd.7 \ ocf_heartbeat_Raid1.7 \ diff -uNr a/heartbeat/Makefile.am b/heartbeat/Makefile.am --- a/heartbeat/Makefile.am 2016-02-02 14:49:34.546698286 +0100 +++ b/heartbeat/Makefile.am 2016-02-02 14:50:29.894979440 +0100 @@ -52,7 +52,7 @@ IPv6addr_LDADD = -lplumb $(LIBNETLIBS) send_ua_LDADD = $(LIBNETLIBS) -osp_SCRIPTS = NovaCompute \ +osp_SCRIPTS = nova-compute-wait \ NovaEvacuate ocf_SCRIPTS = ClusterMon \ diff -uNr a/heartbeat/NovaCompute b/heartbeat/NovaCompute --- a/heartbeat/NovaCompute 2016-02-02 14:49:34.541698351 +0100 +++ b/heartbeat/NovaCompute 1970-01-01 01:00:00.000000000 +0100 @@ -1,366 +0,0 @@ -#!/bin/sh -# -# -# NovaCompute agent manages compute daemons. -# -# Copyright (c) 2015 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. -# - -####################################################################### -# Initialization: - -### -: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} -. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs -### - -: ${__OCF_ACTION=$1} - -####################################################################### - -meta_data() { - cat < - - -1.0 - - -OpenStack Nova Compute Server. - -OpenStack Nova Compute Server - - - - - -Authorization URL for connecting to keystone in admin context - -Authorization URL - - - - - -Username for connecting to keystone in admin context - -Username - - - - -Password for connecting to keystone in admin context - -Password - - - - - -Tenant name for connecting to keystone in admin context. -Note that with Keystone V3 tenant names are only unique within a domain. - -Tenant name - - - - - -DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN - -DNS domain - - - - - -Nova API location (internal, public or admin URL) - -Nova API location (internal, public or admin URL) - - - - - -Disable shared storage recovery for instances. Use at your own risk! - -Disable shared storage recovery for instances - - - - - -How long to wait for nova to finish evacuating instances elsewhere -before starting nova-compute. Only used when the agent detects -evacuations might be in progress. - -You may need to increase the start timeout when increasing this value. - -Delay to allow evacuations time to complete - - - - - - - - - - - - - -END -} - -####################################################################### - -# don't exit on TERM, to test that lrmd makes sure that we do exit -trap sigterm_handler TERM -sigterm_handler() { - ocf_log info "They use TERM to bring us down. No such luck." - return -} - -nova_usage() { - cat </dev/null) - if [ $? = 1 ]; then - if [ "x${OCF_RESKEY_domain}" != x ]; then - NOVA_HOST=$(uname -n | awk -F. '{print $1}') - else - NOVA_HOST=$(uname -n) - fi - fi - - # We only need to check a configured value, calculated ones are fine - openstack-config --get /etc/nova/nova.conf DEFAULT host 2>/dev/null - if [ $? = 0 ]; then - if [ "x${OCF_RESKEY_domain}" != x ]; then - short_host=$(uname -n | awk -F. '{print $1}') - if [ "x$NOVA_HOST" != "x${short_host}" ]; then - ocf_exit_reason "Invalid Nova host name, must be ${short_host} in order for instance recovery to function" - rc=$OCF_ERR_CONFIGURED - fi - - elif [ "x$NOVA_HOST" != "x$(uname -n)" ]; then - ocf_exit_reason "Invalid Nova host name, must be $(uname -n) in order for instance recovery to function" - rc=$OCF_ERR_CONFIGURED - fi - fi - - if [ $rc != $OCF_SUCCESS ]; then - exit $rc - fi - return $rc -} - -: ${OCF_RESKEY_evacuation_delay=120} -case $__OCF_ACTION in -meta-data) meta_data - exit $OCF_SUCCESS - ;; -usage|help) nova_usage - exit $OCF_SUCCESS - ;; -esac - -case $__OCF_ACTION in -start) nova_validate; nova_start;; -stop) nova_stop;; -monitor) nova_validate; nova_monitor;; -notify) nova_notify;; -validate-all) exit $OCF_SUCCESS;; -*) nova_usage - exit $OCF_ERR_UNIMPLEMENTED - ;; -esac -rc=$? -ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc" -exit $rc diff -uNr a/heartbeat/nova-compute-wait b/heartbeat/nova-compute-wait --- a/heartbeat/nova-compute-wait 1970-01-01 01:00:00.000000000 +0100 +++ b/heartbeat/nova-compute-wait 2016-02-02 14:50:29.894979440 +0100 @@ -0,0 +1,304 @@ +#!/bin/sh +# +# +# nova-compute-wait agent manages compute daemons. +# +# Copyright (c) 2015 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Further, this software is distributed without any warranty that it is +# free of the rightful claim of any third person regarding infringement +# or the like. Any license provided herein, whether implied or +# otherwise, applies only to this software file. Patent licenses, if +# any, provided herein do not apply to combinations of this program with +# other software, or any other product whatsoever. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. +# + +####################################################################### +# Initialization: + +### +: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} +. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs +### + +: ${__OCF_ACTION=$1} + +####################################################################### + +meta_data() { + cat < + + +1.0 + + +OpenStack Nova Compute Server. + +OpenStack Nova Compute Server + + + + + +Authorization URL for connecting to keystone in admin context + +Authorization URL + + + + + +Username for connecting to keystone in admin context + +Username + + + + +Password for connecting to keystone in admin context + +Password + + + + + +Tenant name for connecting to keystone in admin context. +Note that with Keystone V3 tenant names are only unique within a domain. + +Tenant name + + + + + +DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN + +DNS domain + + + + + +Nova API location (internal, public or admin URL) + +Nova API location (internal, public or admin URL) + + + + + +Disable shared storage recovery for instances. Use at your own risk! + +Disable shared storage recovery for instances + + + + + +How long to wait for nova to finish evacuating instances elsewhere +before starting nova-compute. Only used when the agent detects +evacuations might be in progress. + +You may need to increase the start timeout when increasing this value. + +Delay to allow evacuations time to complete + + + + + + + + + + + + + +END +} + +####################################################################### + +# don't exit on TERM, to test that lrmd makes sure that we do exit +trap sigterm_handler TERM +sigterm_handler() { + ocf_log info "They use TERM to bring us down. No such luck." + return +} + +nova_usage() { + cat </dev/null) + if [ $? = 1 ]; then + if [ "x${OCF_RESKEY_domain}" != x ]; then + NOVA_HOST=$(uname -n | awk -F. '{print $1}') + else + NOVA_HOST=$(uname -n) + fi + fi + + # We only need to check a configured value, calculated ones are fine + openstack-config --get /etc/nova/nova.conf DEFAULT host 2>/dev/null + if [ $? = 0 ]; then + if [ "x${OCF_RESKEY_domain}" != x ]; then + short_host=$(uname -n | awk -F. '{print $1}') + if [ "x$NOVA_HOST" != "x${short_host}" ]; then + ocf_exit_reason "Invalid Nova host name, must be ${short_host} in order for instance recovery to function" + rc=$OCF_ERR_CONFIGURED + fi + + elif [ "x$NOVA_HOST" != "x$(uname -n)" ]; then + ocf_exit_reason "Invalid Nova host name, must be $(uname -n) in order for instance recovery to function" + rc=$OCF_ERR_CONFIGURED + fi + fi + + if [ $rc != $OCF_SUCCESS ]; then + exit $rc + fi + return $rc +} + +: ${OCF_RESKEY_evacuation_delay=120} +case $__OCF_ACTION in +meta-data) meta_data + exit $OCF_SUCCESS + ;; +usage|help) nova_usage + exit $OCF_SUCCESS + ;; +esac + +case $__OCF_ACTION in +start) nova_validate; nova_start;; +stop) nova_stop;; +monitor) nova_validate; nova_monitor;; +notify) nova_notify;; +validate-all) exit $OCF_SUCCESS;; +*) nova_usage + exit $OCF_ERR_UNIMPLEMENTED + ;; +esac +rc=$? +ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc" +exit $rc diff -uNr a/heartbeat/NovaEvacuate b/heartbeat/NovaEvacuate --- a/heartbeat/NovaEvacuate 2016-02-02 14:49:34.541698351 +0100 +++ b/heartbeat/NovaEvacuate 2016-02-02 14:50:22.768072003 +0100 @@ -141,7 +141,7 @@ } 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,12 @@ return $OCF_NOT_RUNNING fi - handle_evacuations $(attrd_updater -n evacute -A | tr '="' ' ' | awk '{print $4" "$6}') + handle_evacuations $( + attrd_updater -n evacuate -A | + sed 's/ value=""/ value="no"/' | + tr '="' ' ' | + awk '{print $4" "$6}' + ) return $OCF_SUCCESS }