diff -uNr a/doc/man/Makefile.am b/doc/man/Makefile.am --- a/doc/man/Makefile.am 2018-06-27 13:22:31.576628598 +0200 +++ b/doc/man/Makefile.am 2018-06-27 13:47:15.902753673 +0200 @@ -75,6 +75,8 @@ ocf_heartbeat_ManageRAID.7 \ ocf_heartbeat_ManageVE.7 \ ocf_heartbeat_NodeUtilization.7 \ + ocf_heartbeat_nova-compute-wait.7 \ + ocf_heartbeat_NovaEvacuate.7 \ ocf_heartbeat_Pure-FTPd.7 \ ocf_heartbeat_Raid1.7 \ ocf_heartbeat_Route.7 \ diff -uNr a/heartbeat/Makefile.am b/heartbeat/Makefile.am --- a/heartbeat/Makefile.am 2018-06-27 13:22:31.574628625 +0200 +++ b/heartbeat/Makefile.am 2018-06-27 13:46:23.621453631 +0200 @@ -29,6 +29,8 @@ ocfdir = $(OCF_RA_DIR_PREFIX)/heartbeat +ospdir = $(OCF_RA_DIR_PREFIX)/openstack + dtddir = $(datadir)/$(PACKAGE_NAME) dtd_DATA = ra-api-1.dtd metadata.rng @@ -50,6 +52,9 @@ IPv6addr_LDADD = -lplumb $(LIBNETLIBS) send_ua_LDADD = $(LIBNETLIBS) +osp_SCRIPTS = nova-compute-wait \ + NovaEvacuate + ocf_SCRIPTS = AoEtarget \ AudibleAlarm \ ClusterMon \ 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 2018-06-27 13:27:15.166830889 +0200 @@ -0,0 +1,317 @@ +#!/bin/sh +# Copyright 2015 Red Hat, Inc. +# +# Description: Manages compute daemons +# +# Authors: Andrew Beekhof +# +# Support: openstack@lists.openstack.org +# License: Apache Software License (ASL) 2.0 +# + + +####################################################################### +# 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 + + + + +Deprecated - do not use anymore. +Deprecated - do not use anymore + + + + +Deprecated - do not use anymore. +Deprecated - do not use anymore + + + +Deprecated - do not use anymore. +Deprecated - do not use anymore + + + + +Deprecated - do not use anymore. +Deprecated - do not use anymore + + + + + +DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN + +DNS domain + + + + +Deprecated - do not use anymore. +Deprecated - do not use anymore + + + + +Deprecated - do not use anymore. +Deprecated - do not use anymore + + + + + +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 </run/systemd/system/openstack-nova-compute.service.d/unfence-20.conf +[Service] +ExecStartPost=/sbin/fence_compute ${fence_options} -o on -n ${NOVA_HOST} +EOF +} + +nova_validate() { + rc=$OCF_SUCCESS + + check_binary crudini + check_binary nova-compute + check_binary fence_compute + + if [ ! -f /etc/nova/nova.conf ]; then + ocf_exit_reason "/etc/nova/nova.conf not found" + exit $OCF_ERR_CONFIGURED + fi + + # Is the state directory writable? + state_dir=$(dirname $statefile) + touch "$state_dir/$$" + if [ $? != 0 ]; then + ocf_exit_reason "Invalid state directory: $state_dir" + return $OCF_ERR_ARGS + fi + rm -f "$state_dir/$$" + + NOVA_HOST=$(crudini --get /etc/nova/nova.conf DEFAULT host 2>/dev/null) + if [ $? = 1 ]; then + short_host=$(uname -n | awk -F. '{print $1}') + if [ "x${OCF_RESKEY_domain}" != x ]; then + NOVA_HOST=${short_host}.${OCF_RESKEY_domain} + else + NOVA_HOST=$(uname -n) + fi + fi + + if [ $rc != $OCF_SUCCESS ]; then + exit $rc + fi + return $rc +} + +statefile="${HA_RSCTMP}/${OCF_RESOURCE_INSTANCE}.active" + +: ${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 1970-01-01 01:00:00.000000000 +0100 +++ b/heartbeat/NovaEvacuate 2018-06-27 13:27:18.835781756 +0200 @@ -0,0 +1,388 @@ +#!/bin/sh +# +# Copyright 2015 Red Hat, Inc. +# +# Description: Manages evacuation of nodes running nova-compute +# +# Authors: Andrew Beekhof +# +# Support: openstack@lists.openstack.org +# License: Apache Software License (ASL) 2.0 +# + + +####################################################################### +# Initialization: + +### +: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} +. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs +### + +: ${__OCF_ACTION=$1} + +####################################################################### + +meta_data() { + cat < + + +1.0 + + +Facility for tacking a list of compute nodes and reliably evacuating the ones that fence_evacuate has flagged. + +Evacuator for 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. + +Keystone v2 Tenant or v3 Project Name + + + + + +User's domain name. Used when authenticating to Keystone. + +Keystone v3 User Domain + + + + + +Domain name containing project. Used when authenticating to Keystone. + +Keystone v3 Project Domain + + + + + +Nova API location (internal, public or admin URL) + +Nova API location (internal, public or admin URL) + + + + + +Region name for connecting to nova. + +Region name + + + + + +Explicitly allow client to perform "insecure" TLS (https) requests. +The server's certificate will not be verified against any certificate authorities. +This option should be used with caution. + +Allow insecure TLS requests + + + + + +Disable shared storage recovery for instances. Use at your own risk! + +Disable shared storage recovery for instances + + + + + +Enable extra logging from the evacuation process + +Enable debug logging + + + + + + + + + + + + + +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 +} + +evacuate_usage() { + cat <