Old ocf file cleanup
This change removes missed ocf scripts from deployment/ and moves any still referenced files to files/fuel-ha-utils. Also cleans up commented out ocf files from the puppet code. Change-Id: Ie6bd1bae40fab175aff14274026bf506f28eb0e4 Related-Bug: 1457441
This commit is contained in:
Alex Schultz
@@ -1,339 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
#
|
||||
# OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute)
|
||||
#
|
||||
# Description: Manages an OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute) process as an HA resource
|
||||
#
|
||||
# Authors: Emilien Macchi
|
||||
# Mainly inspired by the Nova Scheduler resource agent written by Sebastien Han
|
||||
#
|
||||
# Support: openstack@lists.launchpad.net
|
||||
# License: Apache Software License (ASL) 2.0
|
||||
#
|
||||
#
|
||||
# See usage() function below for more details ...
|
||||
#
|
||||
# OCF instance parameters:
|
||||
# OCF_RESKEY_binary
|
||||
# OCF_RESKEY_config
|
||||
# OCF_RESKEY_user
|
||||
# OCF_RESKEY_pid
|
||||
# OCF_RESKEY_monitor_binary
|
||||
# OCF_RESKEY_amqp_server_port
|
||||
# OCF_RESKEY_additional_parameters
|
||||
#######################################################################
|
||||
# Initialization:
|
||||
|
||||
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
|
||||
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
||||
|
||||
#######################################################################
|
||||
|
||||
# Fill in some defaults if no values are specified
|
||||
|
||||
OCF_RESKEY_binary_default="ceilometer-agent-compute"
|
||||
OCF_RESKEY_config_default="/etc/ceilometer/ceilometer.conf"
|
||||
OCF_RESKEY_user_default="ceilometer"
|
||||
OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
|
||||
OCF_RESKEY_amqp_server_port_default="5673"
|
||||
|
||||
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
|
||||
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
|
||||
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
|
||||
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
|
||||
: ${OCF_RESKEY_amqp_server_port=${OCF_RESKEY_amqp_server_port_default}}
|
||||
|
||||
#######################################################################
|
||||
|
||||
usage() {
|
||||
cat <<UEND
|
||||
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
|
||||
|
||||
$0 manages an OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute) process as an HA resource
|
||||
|
||||
The 'start' operation starts the scheduler service.
|
||||
The 'stop' operation stops the scheduler service.
|
||||
The 'validate-all' operation reports whether the parameters are valid
|
||||
The 'meta-data' operation reports this RA's meta-data information
|
||||
The 'status' operation reports whether the scheduler service is running
|
||||
The 'monitor' operation reports whether the scheduler service seems to be working
|
||||
|
||||
UEND
|
||||
}
|
||||
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
<resource-agent name="ceilometer-agent-compute">
|
||||
<version>1.0</version>
|
||||
|
||||
<longdesc lang="en">
|
||||
Resource agent for the OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute)
|
||||
May manage a ceilometer-agent-compute instance or a clone set that
|
||||
creates a distributed ceilometer-agent-compute cluster.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Manages the OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute)</shortdesc>
|
||||
<parameters>
|
||||
|
||||
<parameter name="binary" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Location of the OpenStack Ceilometer Compute Agent server binary (ceilometer-agent-compute)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Ceilometer Compute Agent server binary (ceilometer-agent-compute)</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_binary_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="config" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Location of the OpenStack Ceilometer Compute Agent Compute (ceilometer-agent-compute) configuration file
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Ceilometer Compute Agent (ceilometer-agent-compute registry) config file</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_config_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="user" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
User running OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute) user</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_user_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="pid" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
The pid file to use for this OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute) instance
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute) pid file</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_pid_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="amqp_server_port" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
The listening port number of the AMQP server. Use for monitoring purposes
|
||||
</longdesc>
|
||||
<shortdesc lang="en">AMQP listening port</shortdesc>
|
||||
<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="additional_parameters" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Additional parameters to pass on to the OpenStack Ceilometer Compute Agent Service (ceilometer-agent-compute)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Additional parameters for ceilometer-agent-compute</shortdesc>
|
||||
<content type="string" />
|
||||
</parameter>
|
||||
|
||||
</parameters>
|
||||
|
||||
<actions>
|
||||
<action name="start" timeout="20" />
|
||||
<action name="stop" timeout="20" />
|
||||
<action name="status" timeout="20" />
|
||||
<action name="monitor" timeout="30" interval="20" />
|
||||
<action name="validate-all" timeout="5" />
|
||||
<action name="meta-data" timeout="5" />
|
||||
</actions>
|
||||
</resource-agent>
|
||||
END
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
# Functions invoked by resource manager actions
|
||||
|
||||
ceilometer_agent_compute_check_port() {
|
||||
# This function has been taken from the squid RA and improved a bit
|
||||
# The length of the integer must be 4
|
||||
# Examples of valid port: "1080", "0080"
|
||||
# Examples of invalid port: "1080bad", "0", "0000", ""
|
||||
|
||||
local int
|
||||
local cnt
|
||||
|
||||
int="$1"
|
||||
cnt=${#int}
|
||||
echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
|
||||
|
||||
if [ $? -ne 0 ] || [ $cnt -ne 4 ]; then
|
||||
ocf_log err "Invalid port number: $1"
|
||||
exit $OCF_ERR_CONFIGURED
|
||||
fi
|
||||
}
|
||||
|
||||
ceilometer_agent_compute_validate() {
|
||||
local rc
|
||||
|
||||
check_binary $OCF_RESKEY_binary
|
||||
check_binary netstat
|
||||
ceilometer_agent_compute_check_port $OCF_RESKEY_amqp_server_port
|
||||
|
||||
# A config file on shared storage that is not available
|
||||
# during probes is OK.
|
||||
if [ ! -f $OCF_RESKEY_config ]; then
|
||||
if ! ocf_is_probe; then
|
||||
ocf_log err "Config $OCF_RESKEY_config doesn't exist"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
ocf_log_warn "Config $OCF_RESKEY_config not available during a probe"
|
||||
fi
|
||||
|
||||
getent passwd $OCF_RESKEY_user >/dev/null 2>&1
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ]; then
|
||||
ocf_log err "User $OCF_RESKEY_user doesn't exist"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
|
||||
true
|
||||
}
|
||||
|
||||
ceilometer_agent_compute_status() {
|
||||
local pid
|
||||
local rc
|
||||
|
||||
if [ ! -f $OCF_RESKEY_pid ]; then
|
||||
ocf_log info "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) is not running"
|
||||
return $OCF_NOT_RUNNING
|
||||
else
|
||||
pid=`cat $OCF_RESKEY_pid`
|
||||
fi
|
||||
|
||||
ocf_run -warn kill -s 0 $pid
|
||||
rc=$?
|
||||
if [ $rc -eq 0 ]; then
|
||||
return $OCF_SUCCESS
|
||||
else
|
||||
ocf_log info "Old PID file found, but OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) is not running"
|
||||
return $OCF_NOT_RUNNING
|
||||
fi
|
||||
}
|
||||
|
||||
ceilometer_agent_compute_monitor() {
|
||||
local rc
|
||||
local pid
|
||||
local scheduler_amqp_check
|
||||
|
||||
ceilometer_agent_compute_status
|
||||
rc=$?
|
||||
|
||||
# If status returned anything but success, return that immediately
|
||||
if [ $rc -ne $OCF_SUCCESS ]; then
|
||||
return $rc
|
||||
fi
|
||||
|
||||
# Check the connections according to the PID.
|
||||
# We are sure to hit the scheduler process and not other process with the same connection behavior
|
||||
pid=`cat $OCF_RESKEY_pid`
|
||||
scheduler_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_amqp_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"`
|
||||
rc=$?
|
||||
ocf_log debug "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) monitor succeeded"
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
ceilometer_agent_compute_start() {
|
||||
local rc
|
||||
|
||||
ceilometer_agent_compute_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_SUCCESS ]; then
|
||||
ocf_log info "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) already running"
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
|
||||
# run the actual ceilometer-agent-compute daemon. Don't use ocf_run as we're sending the tool's output
|
||||
# straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
|
||||
su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
|
||||
$OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
|
||||
|
||||
# Spin waiting for the server to come up.
|
||||
while true; do
|
||||
ceilometer_agent_compute_monitor
|
||||
rc=$?
|
||||
[ $rc -eq $OCF_SUCCESS ] && break
|
||||
if [ $rc -ne $OCF_NOT_RUNNING ]; then
|
||||
ocf_log err "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) start failed"
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
|
||||
ocf_log info "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) started"
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
ceilometer_agent_compute_stop() {
|
||||
local rc
|
||||
local pid
|
||||
|
||||
ceilometer_agent_compute_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_NOT_RUNNING ]; then
|
||||
ocf_log info "OpenStack Compute Compute Agent (ceilometer-agent-compute) already stopped"
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
|
||||
# Try SIGTERM
|
||||
pid=`cat $OCF_RESKEY_pid`
|
||||
ocf_run kill -s TERM $pid
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ]; then
|
||||
ocf_log err "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) couldn't be stopped"
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
# stop waiting
|
||||
shutdown_timeout=15
|
||||
if [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then
|
||||
shutdown_timeout=$((($OCF_RESKEY_CRM_meta_timeout/1000)-5))
|
||||
fi
|
||||
count=0
|
||||
while [ $count -lt $shutdown_timeout ]; do
|
||||
ceilometer_agent_compute_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_NOT_RUNNING ]; then
|
||||
break
|
||||
fi
|
||||
count=`expr $count + 1`
|
||||
sleep 1
|
||||
ocf_log debug "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) still hasn't stopped yet. Waiting ..."
|
||||
done
|
||||
|
||||
ceilometer_agent_compute_status
|
||||
rc=$?
|
||||
if [ $rc -ne $OCF_NOT_RUNNING ]; then
|
||||
# SIGTERM didn't help either, try SIGKILL
|
||||
ocf_log info "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) failed to stop after ${shutdown_timeout}s \
|
||||
using SIGTERM. Trying SIGKILL ..."
|
||||
ocf_run kill -s KILL $pid
|
||||
fi
|
||||
|
||||
ocf_log info "OpenStack Ceilometer Compute Agent (ceilometer-agent-compute) stopped"
|
||||
|
||||
rm -f $OCF_RESKEY_pid
|
||||
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
|
||||
case "$1" in
|
||||
meta-data) meta_data
|
||||
exit $OCF_SUCCESS;;
|
||||
usage|help) usage
|
||||
exit $OCF_SUCCESS;;
|
||||
esac
|
||||
|
||||
# Anything except meta-data and help must pass validation
|
||||
ceilometer_agent_compute_validate || exit $?
|
||||
|
||||
# What kind of method was invoked?
|
||||
case "$1" in
|
||||
start) ceilometer_agent_compute_start;;
|
||||
stop) ceilometer_agent_compute_stop;;
|
||||
status) ceilometer_agent_compute_status;;
|
||||
monitor) ceilometer_agent_compute_monitor;;
|
||||
validate-all) ;;
|
||||
*) usage
|
||||
exit $OCF_ERR_UNIMPLEMENTED;;
|
||||
esac
|
||||
@@ -1,365 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
#
|
||||
# OpenStack Nova Compute (nova-compute)
|
||||
#
|
||||
# Description: Manages an OpenStack Nova Compute (nova-compute) process as an HA resource
|
||||
#
|
||||
# Authors: Sébastien Han
|
||||
# Mainly inspired by the Glance API resource agent written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr
|
||||
#
|
||||
# Support: openstack@lists.launchpad.net
|
||||
# License: Apache Software License (ASL) 2.0
|
||||
#
|
||||
#
|
||||
# See usage() function below for more details ...
|
||||
#
|
||||
# OCF instance parameters:
|
||||
# OCF_RESKEY_binary
|
||||
# OCF_RESKEY_config
|
||||
# OCF_RESKEY_user
|
||||
# OCF_RESKEY_pid
|
||||
# OCF_RESKEY_amqp_server_port
|
||||
# OCF_RESKEY_zeromq
|
||||
# OCF_RESKEY_additional_parameters
|
||||
#######################################################################
|
||||
# Initialization:
|
||||
|
||||
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
|
||||
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
||||
|
||||
#######################################################################
|
||||
|
||||
# Fill in some defaults if no values are specified
|
||||
PATH=/bin:/sbin:/usr/bin:/usr/sbin
|
||||
|
||||
OCF_RESKEY_binary_default="nova-compute"
|
||||
OCF_RESKEY_config_default="/etc/nova/nova.conf"
|
||||
OCF_RESKEY_user_default="nova"
|
||||
OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid"
|
||||
OCF_RESKEY_amqp_server_port_default="5672"
|
||||
OCF_RESKEY_zeromq_default="false"
|
||||
|
||||
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
|
||||
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
|
||||
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
|
||||
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
|
||||
: ${OCF_RESKEY_amqp_server_port=${OCF_RESKEY_amqp_server_port_default}}
|
||||
: ${OCF_RESKEY_zeromq=${OCF_RESKEY_zeromq_default}}
|
||||
|
||||
#######################################################################
|
||||
|
||||
usage() {
|
||||
cat <<UEND
|
||||
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
|
||||
|
||||
$0 manages an OpenStack Nova Compute (nova-compute) process as an HA resource
|
||||
|
||||
The 'start' operation starts the nova-compute service.
|
||||
The 'stop' operation stops the nova-compute service.
|
||||
The 'validate-all' operation reports whether the parameters are valid
|
||||
The 'meta-data' operation reports this RA's meta-data information
|
||||
The 'status' operation reports whether the nova-compute service is running
|
||||
The 'monitor' operation reports whether the nova-compute service seems to be working
|
||||
|
||||
UEND
|
||||
}
|
||||
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
<resource-agent name="nova-compute">
|
||||
<version>1.0</version>
|
||||
|
||||
<longdesc lang="en">
|
||||
Resource agent for the OpenStack Nova Compute Service (nova-compute)
|
||||
May manage a nova-compute instance or a clone set that
|
||||
creates a distributed nova-compute cluster.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Manages the OpenStack Nova Compute (nova-compute)</shortdesc>
|
||||
<parameters>
|
||||
|
||||
<parameter name="binary" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Location of the OpenStack Nova Compute server binary (nova-compute)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Nova Compute server binary (nova-compute)</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_binary_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="config" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Location of the OpenStack Nova Compute (nova-compute) configuration file
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Nova Compute (nova-compute registry) config file</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_config_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="user" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
User running OpenStack Nova Compute (nova-compute)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Nova Compute (nova-compute) user</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_user_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="pid" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
The pid file to use for this OpenStack Nova Compute (nova-compute) instance
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Nova Compute (nova-compute) pid file</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_pid_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="amqp_server_port" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
The listening port number of the AMQP server. Mandatory to perform a monitor check
|
||||
</longdesc>
|
||||
<shortdesc lang="en">AMQP listening port</shortdesc>
|
||||
<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="zeromq" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
If zeromq is used, this will disable the connection test to the AMQP server
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Zero-MQ usage</shortdesc>
|
||||
<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="additional_parameters" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Additional parameters to pass on to the OpenStack Nova Compute (nova-compute)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Additional parameters for nova-compute</shortdesc>
|
||||
<content type="string" />
|
||||
</parameter>
|
||||
|
||||
</parameters>
|
||||
|
||||
<actions>
|
||||
<action name="start" timeout="10" />
|
||||
<action name="stop" timeout="10" />
|
||||
<action name="status" timeout="10" />
|
||||
<action name="monitor" timeout="5" interval="10" />
|
||||
<action name="validate-all" timeout="5" />
|
||||
<action name="meta-data" timeout="5" />
|
||||
</actions>
|
||||
</resource-agent>
|
||||
END
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
# Functions invoked by resource manager actions
|
||||
|
||||
nova_compute_check_port() {
|
||||
# This function has been taken from the squid RA and improved a bit
|
||||
# The length of the integer must be 4
|
||||
# Examples of valid port: "1080", "0080"
|
||||
# Examples of invalid port: "1080bad", "0", "0000", ""
|
||||
|
||||
local int
|
||||
local cnt
|
||||
|
||||
int="$1"
|
||||
cnt=${#int}
|
||||
echo $int | egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
|
||||
|
||||
if [ $? -ne 0 ] || [ $cnt -ne 4 ]; then
|
||||
ocf_log err "Invalid port number: $1"
|
||||
exit $OCF_ERR_CONFIGURED
|
||||
fi
|
||||
}
|
||||
|
||||
nova_compute_validate() {
|
||||
local rc
|
||||
|
||||
check_binary $OCF_RESKEY_binary
|
||||
check_binary netstat
|
||||
|
||||
nova_compute_check_port $OCF_RESKEY_amqp_server_port
|
||||
|
||||
# A config file on shared storage that is not available
|
||||
# during probes is OK.
|
||||
if [ ! -f $OCF_RESKEY_config ]; then
|
||||
if ! ocf_is_probe; then
|
||||
ocf_log err "Config $OCF_RESKEY_config doesn't exist"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
ocf_log_warn "Config $OCF_RESKEY_config not available during a probe"
|
||||
fi
|
||||
|
||||
getent passwd $OCF_RESKEY_user >/dev/null 2>&1
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ]; then
|
||||
ocf_log err "User $OCF_RESKEY_user doesn't exist"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
|
||||
true
|
||||
}
|
||||
|
||||
nova_compute_status() {
|
||||
local pid
|
||||
local rc
|
||||
|
||||
# check and make PID file dir
|
||||
local PID_DIR="$( dirname $OCF_RESKEY_pid )"
|
||||
if [ ! -d "${PID_DIR}" ] ; then
|
||||
ocf_log debug "Create pid file dir: ${PID_DIR} and chown to ${OCF_RESKEY_user}"
|
||||
mkdir -p "${PID_DIR}"
|
||||
chown -R ${OCF_RESKEY_user} "${PID_DIR}"
|
||||
chmod 755 "${PID_DIR}"
|
||||
fi
|
||||
|
||||
if [ ! -f $OCF_RESKEY_pid ]; then
|
||||
ocf_log info "OpenStack Nova Compute (nova-compute) is not running"
|
||||
return $OCF_NOT_RUNNING
|
||||
else
|
||||
pid=`cat $OCF_RESKEY_pid`
|
||||
fi
|
||||
|
||||
if [ -n "${pid}" ]; then
|
||||
ocf_run -warn kill -s 0 $pid
|
||||
rc=$?
|
||||
else
|
||||
ocf_log err "PID file ${OCF_RESKEY_pid} is empty!"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
if [ $rc -eq 0 ]; then
|
||||
return $OCF_SUCCESS
|
||||
else
|
||||
ocf_log info "Old PID file found, but OpenStack Nova Compute (nova-compute) is not running"
|
||||
return $OCF_NOT_RUNNING
|
||||
fi
|
||||
}
|
||||
|
||||
nova_compute_monitor() {
|
||||
local rc
|
||||
local pid
|
||||
local rc_amqp
|
||||
local console_amqp_check
|
||||
|
||||
nova_compute_status
|
||||
rc=$?
|
||||
|
||||
# If status returned anything but success, return that immediately
|
||||
if [ $rc -ne $OCF_SUCCESS ]; then
|
||||
return $rc
|
||||
fi
|
||||
|
||||
ocf_log debug "OpenStack Nova Compute (nova-compute) monitor succeeded"
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
nova_compute_start() {
|
||||
local rc
|
||||
|
||||
nova_compute_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_SUCCESS ]; then
|
||||
ocf_log info "OpenStack Nova Compute (nova-compute) already running"
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
|
||||
# run the actual nova-compute daemon. Don't use ocf_run as we're sending the tool's output
|
||||
# straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
|
||||
su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
|
||||
$OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
|
||||
|
||||
ocf_log debug "Create pid file: ${OCF_RESKEY_pid} with content $(cat ${OCF_RESKEY_pid})"
|
||||
# Spin waiting for the server to come up.
|
||||
# Let the CRM/LRM time us out if required
|
||||
while true; do
|
||||
nova_compute_monitor
|
||||
rc=$?
|
||||
[ $rc -eq $OCF_SUCCESS ] && break
|
||||
if [ $rc -ne $OCF_NOT_RUNNING ]; then
|
||||
ocf_log err "OpenStack Nova Compute (nova-compute) start failed"
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
sleep 3
|
||||
done
|
||||
|
||||
ocf_log info "OpenStack Nova Compute (nova-compute) started"
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
nova_compute_stop() {
|
||||
local rc
|
||||
local pid
|
||||
|
||||
nova_compute_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_NOT_RUNNING ]; then
|
||||
ocf_log info "OpenStack Nova Compute (nova-compute) already stopped"
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
|
||||
# Try SIGTERM
|
||||
pid=`cat $OCF_RESKEY_pid`
|
||||
ocf_run kill -s TERM $pid
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ]; then
|
||||
ocf_log err "OpenStack Nova Compute (nova-compute) couldn't be stopped"
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
# stop waiting
|
||||
shutdown_timeout=15
|
||||
if [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then
|
||||
shutdown_timeout=$((($OCF_RESKEY_CRM_meta_timeout/1000)-5))
|
||||
fi
|
||||
count=0
|
||||
while [ $count -lt $shutdown_timeout ]; do
|
||||
nova_compute_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_NOT_RUNNING ]; then
|
||||
break
|
||||
fi
|
||||
count=`expr $count + 1`
|
||||
sleep 1
|
||||
ocf_log debug "OpenStack Nova Compute (nova-compute) still hasn't stopped yet. Waiting ..."
|
||||
done
|
||||
|
||||
nova_compute_status
|
||||
rc=$?
|
||||
if [ $rc -ne $OCF_NOT_RUNNING ]; then
|
||||
# SIGTERM didn't help either, try SIGKILL
|
||||
ocf_log info "OpenStack Nova Compute (nova-compute) failed to stop after ${shutdown_timeout}s \
|
||||
using SIGTERM. Trying SIGKILL ..."
|
||||
ocf_run kill -s KILL $pid
|
||||
fi
|
||||
|
||||
ocf_log info "OpenStack Nova Compute (nova-compute) stopped"
|
||||
|
||||
ocf_log debug "Delete pid file: ${OCF_RESKEY_pid} with content $(cat ${OCF_RESKEY_pid})"
|
||||
rm -f $OCF_RESKEY_pid
|
||||
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
|
||||
case "$1" in
|
||||
meta-data) meta_data
|
||||
exit $OCF_SUCCESS;;
|
||||
usage|help) usage
|
||||
exit $OCF_SUCCESS;;
|
||||
esac
|
||||
|
||||
# Anything except meta-data and help must pass validation
|
||||
nova_compute_validate || exit $?
|
||||
|
||||
# What kind of method was invoked?
|
||||
case "$1" in
|
||||
start) nova_compute_start;;
|
||||
stop) nova_compute_stop;;
|
||||
status) nova_compute_status;;
|
||||
monitor) nova_compute_monitor;;
|
||||
validate-all) ;;
|
||||
*) usage
|
||||
exit $OCF_ERR_UNIMPLEMENTED;;
|
||||
esac
|
||||
@@ -1,558 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
#
|
||||
# OpenStack Network Service (nova-network) (replaced by Neutron in Havana)
|
||||
#
|
||||
# Description: Manages an OpenStack Network Service (nova-network) process as an HA resource
|
||||
#
|
||||
# Authors: Sebastien Han & Emilien Macchi
|
||||
# Mainly inspired by the Nova Scheduler resource agent written by Sebastien Han : http://goo.gl/s8hOU
|
||||
# Which are also inspired by the resource agents written by Martin Gerhard Loschwitz from Hastexo: http://goo.gl/whLpr
|
||||
#
|
||||
# Support: openstack@lists.launchpad.net
|
||||
# License: Apache Software License (ASL) 2.0
|
||||
#
|
||||
#
|
||||
# See usage() function below for more details ...
|
||||
#
|
||||
# OCF instance parameters:
|
||||
# OCF_RESKEY_binary
|
||||
# OCF_RESKEY_config
|
||||
# OCF_RESKEY_user
|
||||
# OCF_RESKEY_password
|
||||
# OCF_RESKEY_tenant
|
||||
# OCF_RESKEY_region
|
||||
# OCF_RESKEY_auth_url
|
||||
# OCF_RESKEY_pid
|
||||
# OCF_RESKEY_amqp_server_port
|
||||
# OCF_RESKEY_zeromq
|
||||
# OCF_RESKEY_additional_parameters
|
||||
#######################################################################
|
||||
# Initialization:
|
||||
|
||||
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
|
||||
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
||||
|
||||
#######################################################################
|
||||
|
||||
# Fill in some defaults if no values are specified
|
||||
PATH=/bin:/sbin:/usr/bin:/usr/sbin
|
||||
|
||||
OCF_RESKEY_binary_default="nova-network"
|
||||
OCF_RESKEY_config_default="/etc/nova/nova.conf"
|
||||
OCF_RESKEY_user_default="nova"
|
||||
OCF_RESKEY_password_default="nova_password"
|
||||
OCF_RESKEY_tenant_default="services"
|
||||
OCF_RESKEY_auth_url_default="http://127.0.0.1:5000/v2.0/"
|
||||
OCF_RESKEY_region_default="RegionOne"
|
||||
OCF_RESKEY_pid_default="${HA_RSCTMP}/${__SCRIPT_NAME}/${__SCRIPT_NAME}.pid"
|
||||
OCF_RESKEY_amqp_server_port_default="5672"
|
||||
OCF_RESKEY_zeromq_default="false"
|
||||
|
||||
: ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}}
|
||||
: ${OCF_RESKEY_config=${OCF_RESKEY_config_default}}
|
||||
: ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
|
||||
: ${OCF_RESKEY_password=${OCF_RESKEY_password_default}}
|
||||
: ${OCF_RESKEY_tenant=${OCF_RESKEY_tenant_default}}
|
||||
: ${OCF_RESKEY_auth_url=${OCF_RESKEY_auth_url_default}}
|
||||
: ${OCF_RESKEY_region=${OCF_RESKEY_region_default}}
|
||||
: ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
|
||||
: ${OCF_RESKEY_amqp_server_port=${OCF_RESKEY_amqp_server_port_default}}
|
||||
: ${OCF_RESKEY_zeromq=${OCF_RESKEY_zeromq_default}}
|
||||
|
||||
#######################################################################
|
||||
|
||||
usage() {
|
||||
cat <<UEND
|
||||
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
|
||||
|
||||
$0 manages an OpenStack Network Service (nova-network) process as an HA resource
|
||||
|
||||
The 'start' operation starts the nova-network service.
|
||||
The 'stop' operation stops the nova-network service.
|
||||
The 'validate-all' operation reports whether the parameters are valid
|
||||
The 'meta-data' operation reports this RA's meta-data information
|
||||
The 'status' operation reports whether the nova-network service is running
|
||||
The 'monitor' operation reports whether the nova-network service seems to be working
|
||||
|
||||
UEND
|
||||
}
|
||||
|
||||
meta_data() {
|
||||
cat <<END
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
|
||||
<resource-agent name="nova-network">
|
||||
<version>1.0</version>
|
||||
|
||||
<longdesc lang="en">
|
||||
Resource agent for the OpenStack Nova Network Service (nova-network)
|
||||
May manage a nova-network instance or a clone set that
|
||||
creates a distributed nova-network cluster.
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Manages the OpenStack Network Service (nova-network)</shortdesc>
|
||||
<parameters>
|
||||
|
||||
<parameter name="binary" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Location of the OpenStack Nova Network server binary (nova-network)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Nova Network server binary (nova-network)</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_binary_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="config" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Location of the OpenStack Network Service (nova-network) configuration file
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Nova Network (nova-network) config file</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_config_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="user" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
User running OpenStack Network Service (nova-network)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Network Service (nova-network) user</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_user_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="password" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Password for nova-network
|
||||
</longdesc>
|
||||
<shortdesc lang="en">nova-network password</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_password_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="auth_url" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
OpenStack Identity Service (Keystone) URL
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Keystone URL for nova-network</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_auth_url_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="region" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
OpenStack Identity Service (Keystone) Region
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Keystone Region for nova-network</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_region_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="pid" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
The pid file to use for this OpenStack Network Service (nova-network) instance
|
||||
</longdesc>
|
||||
<shortdesc lang="en">OpenStack Network Service (nova-network) pid file</shortdesc>
|
||||
<content type="string" default="${OCF_RESKEY_pid_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="amqp_server_port" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
The listening port number of the AMQP server. Mandatory to perform a monitor check
|
||||
</longdesc>
|
||||
<shortdesc lang="en">AMQP listening port</shortdesc>
|
||||
<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="zeromq" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
If zeromq is used, this will disable the connection test to the AMQP server
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Zero-MQ usage</shortdesc>
|
||||
<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />
|
||||
</parameter>
|
||||
|
||||
<parameter name="additional_parameters" unique="0" required="0">
|
||||
<longdesc lang="en">
|
||||
Additional parameters to pass on to the OpenStack Network Service (nova-network)
|
||||
</longdesc>
|
||||
<shortdesc lang="en">Additional parameters for nova-network</shortdesc>
|
||||
<content type="string" />
|
||||
</parameter>
|
||||
|
||||
</parameters>
|
||||
|
||||
<actions>
|
||||
<action name="start" timeout="20" />
|
||||
<action name="stop" timeout="20" />
|
||||
<action name="status" timeout="20" />
|
||||
<action name="monitor" timeout="30" interval="20" />
|
||||
<action name="validate-all" timeout="5" />
|
||||
<action name="meta-data" timeout="5" />
|
||||
</actions>
|
||||
</resource-agent>
|
||||
END
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
# Functions invoked by resource manager actions
|
||||
|
||||
nova_network_check_port() {
|
||||
# This function has been taken from the squid RA and improved a bit
|
||||
# The length of the integer must be 4
|
||||
# Examples of valid port: "1080", "0080"
|
||||
# Examples of invalid port: "1080bad", "0", "0000", ""
|
||||
local int
|
||||
local cnt
|
||||
|
||||
int="$1"
|
||||
cnt=${#int}
|
||||
echo $int | egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
|
||||
|
||||
if [ $? -ne 0 ] || [ $cnt -ne 4 ]; then
|
||||
ocf_log err "Invalid port number: $1"
|
||||
exit $OCF_ERR_CONFIGURED
|
||||
fi
|
||||
}
|
||||
|
||||
nova_network_validate() {
|
||||
local rc
|
||||
|
||||
check_binary $OCF_RESKEY_binary
|
||||
check_binary netstat
|
||||
check_binary ip
|
||||
check_binary iptables
|
||||
check_binary ip6tables
|
||||
|
||||
nova_network_check_port $OCF_RESKEY_amqp_server_port
|
||||
|
||||
# A config file on shared storage that is not available
|
||||
# during probes is OK.
|
||||
if [ ! -f $OCF_RESKEY_config ]; then
|
||||
if ! ocf_is_probe; then
|
||||
ocf_log err "Config $OCF_RESKEY_config doesn't exist"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
ocf_log_warn "Config $OCF_RESKEY_config not available during a probe"
|
||||
fi
|
||||
|
||||
getent passwd $OCF_RESKEY_user >/dev/null 2>&1
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ]; then
|
||||
ocf_log err "User $OCF_RESKEY_user doesn't exist"
|
||||
return $OCF_ERR_INSTALLED
|
||||
fi
|
||||
|
||||
true
|
||||
}
|
||||
|
||||
nova_network_cleanup() {
|
||||
network_manager_nlines=$(egrep -c -e '^network_manager' $OCF_RESKEY_config)
|
||||
|
||||
if [ $network_manager_nlines -eq 0 ]; then
|
||||
ocf_log err "You must specify 'network_manager' in $OCF_RESKEY_config"
|
||||
return OCF_ERR_CONFIGURED
|
||||
fi
|
||||
|
||||
shutdown_timeout=15
|
||||
if [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then
|
||||
shutdown_timeout=$((($OCF_RESKEY_CRM_meta_timeout/1000)-6))
|
||||
fi
|
||||
|
||||
count=0
|
||||
alive=$(ls /var/lib/nova/networks/*.pid | wc -l)
|
||||
dnsmasq_pids=$(cat /var/lib/nova/networks/*.pid)
|
||||
while [ $alive -gt 0 ] && [ $count -lt $shutdown_timeout ]; do
|
||||
ocf_run kill -s TERM $dnsmasq_pids
|
||||
|
||||
iteration_time=3
|
||||
sleep $iteration_time
|
||||
|
||||
alive=0
|
||||
np=""
|
||||
|
||||
# Find out if there are dnsmasq processes that are
|
||||
# still alive after receiveing TERM signal
|
||||
for pid in $dnsmasq_pids ; do
|
||||
# Check if process with $pid is running
|
||||
ocf_run ps -p $pid > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
np="$np $pid"
|
||||
((alive++))
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $alive -gt 0 ] ; then
|
||||
dnsmasq_pids=$np
|
||||
ocf_log debug "dnsmasq processes started by nova-network still hasn't stopped yet. Waiting ..."
|
||||
fi
|
||||
|
||||
((count+=$iteration_time))
|
||||
done
|
||||
|
||||
if [ $alive -gt 0 ] ; then
|
||||
alive=0
|
||||
|
||||
ocf_run kill -s KILL $dnsmasq_pids
|
||||
sleep 1
|
||||
|
||||
for pid in $dnsmasq_pids ; do
|
||||
ocf_run ps -p $pid > /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
((alive++))
|
||||
fi
|
||||
done
|
||||
if [ $alive -gt 0 ] ; then
|
||||
ocf_log err "Termination of dnsmasq processes stop failed"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
fi
|
||||
ocf_log info "dnsmasq processes started by nova-network stopped"
|
||||
|
||||
use_ipv6=$(egrep -e '^use_ipv6' $OCF_RESKEY_config | sed -e "s/$regexp/\1/")
|
||||
|
||||
# Consider IPv4 if 'use_ipv6' was not explicitly defined
|
||||
if [ -z $use_ipv6 ];then
|
||||
use_ipv6=false
|
||||
fi
|
||||
|
||||
# Flush firewall rules that nova-network creates
|
||||
prefix="nova-network"
|
||||
case $use_ipv6 in
|
||||
# IPv4
|
||||
false)
|
||||
filter_chains="$prefix-FORWARD $prefix-INPUT $prefix-OUTPUT $prefix-local"
|
||||
for filter_chain in $filter_chains
|
||||
do
|
||||
ocf_run iptables -t filter -F $filter_chain
|
||||
done
|
||||
|
||||
nat_chains="$prefix-OUTPUT $prefix-POSTROUTING $prefix-PREROUTING \
|
||||
$prefix-float-snat $prefix-snat"
|
||||
for nat_chain in $nat_chains
|
||||
do
|
||||
ocf_run iptables -t nat -F $nat_chain
|
||||
done
|
||||
|
||||
ocf_run iptables -t mangle -F $prefix-POSTROUTING
|
||||
;;
|
||||
|
||||
# IPv6
|
||||
true)
|
||||
filter_chains="$prefix-FORWARD $prefix-INPUT $prefix-OUTPUT $prefix-local"
|
||||
|
||||
for chain in $filter_chains
|
||||
do
|
||||
ocf_run ip6tables -t filter -F $chain
|
||||
done
|
||||
;;
|
||||
esac
|
||||
ocf_log debug "firewall rules created by nova-network removed"
|
||||
|
||||
|
||||
# Regular expression to extract value from .ini style config file line
|
||||
regexp='.*=\s*\(\w\+\)'
|
||||
|
||||
# Grab last network manager value (FlatDHCP or VLAN) from config file
|
||||
network_manager=$(egrep -e '^network_manager' $OCF_RESKEY_config | sed -e "s/$regexp/\1/" | tail -n 1)
|
||||
case $network_manager in
|
||||
nova.network.manager.FlatDHCPManager)
|
||||
|
||||
flat_network_bridge_nlines=`egrep --count -e '^flat_network_bridge' $OCF_RESKEY_config`
|
||||
if [ $flat_network_bridge_nlines -ne 1 ]; then
|
||||
ocf_log err "Specifying more than one 'flat_network_bridge' in $OCF_RESKEY_config is not supported"
|
||||
return OCF_ERR_CONFIGURED
|
||||
fi
|
||||
|
||||
# Flush IP address assigned to 'flat_network_bridge' (usually called 'br100')
|
||||
flat_network_bridge=$(egrep -e '^flat_network_bridge' $OCF_RESKEY_config | sed -e "s/$regexp/\1/")
|
||||
ocf_run ip addr flush dev $flat_network_bridge
|
||||
;;
|
||||
nova.network.manager.VlanManager)
|
||||
# Collect all bridge interfaces that were created by
|
||||
# nova-network and remove IP addresses assigned to them
|
||||
nova_bridges=$(OS_TENANT_NAME=$OCF_RESKEY_tenant \
|
||||
OS_USERNAME=$OCF_RESKEY_user \
|
||||
OS_PASSWORD=$OCF_RESKEY_password \
|
||||
OS_AUTH_URL=$OCF_RESKEY_auth_url \
|
||||
OS_ENDPOINT_TYPE=internalURL \
|
||||
OS_REGION_NAME=$OCF_RESKEY_region \
|
||||
nova network-list --fields bridge | egrep -o -e 'br[0-9]{1,4}')
|
||||
for bridge in $nova_bridges
|
||||
do
|
||||
ocf_run ip addr flush dev $bridge
|
||||
done
|
||||
;;
|
||||
*)
|
||||
ocf_log err "Unsupported network manager $NETWORK_MANAGER"
|
||||
return OCF_ERR_GENERIC
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
nova_network_status() {
|
||||
local pid
|
||||
local rc
|
||||
|
||||
# check and make PID file dir
|
||||
local PID_DIR="$( dirname $OCF_RESKEY_pid )"
|
||||
if [ ! -d "${PID_DIR}" ] ; then
|
||||
ocf_log debug "Create pid file dir: ${PID_DIR} and chown to ${OCF_RESKEY_user}"
|
||||
mkdir -p "${PID_DIR}"
|
||||
chown -R ${OCF_RESKEY_user} "${PID_DIR}"
|
||||
chmod 755 "${PID_DIR}"
|
||||
fi
|
||||
|
||||
if [ ! -f $OCF_RESKEY_pid ]; then
|
||||
ocf_log info "OpenStack Nova Network (nova-network) is not running"
|
||||
return $OCF_NOT_RUNNING
|
||||
else
|
||||
pid=`cat $OCF_RESKEY_pid`
|
||||
fi
|
||||
|
||||
if [ -n "${pid}" ]; then
|
||||
ocf_run -warn kill -s 0 $pid
|
||||
rc=$?
|
||||
else
|
||||
ocf_log err "PID file ${OCF_RESKEY_pid} is empty!"
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
if [ $rc -eq 0 ]; then
|
||||
return $OCF_SUCCESS
|
||||
else
|
||||
ocf_log info "Old PID file found, but OpenStack Nova Network (nova-network) is not running"
|
||||
return $OCF_NOT_RUNNING
|
||||
fi
|
||||
}
|
||||
|
||||
nova_network_monitor() {
|
||||
local rc
|
||||
local pid
|
||||
local rc_amqp
|
||||
local network_amqp_check
|
||||
|
||||
nova_network_status
|
||||
rc=$?
|
||||
|
||||
# If status returned anything but success, return that immediately
|
||||
if [ $rc -ne $OCF_SUCCESS ]; then
|
||||
return $rc
|
||||
fi
|
||||
|
||||
ocf_log debug "OpenStack Nova Network (nova-network) monitor succeeded"
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
nova_network_start() {
|
||||
local rc
|
||||
|
||||
nova_network_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_SUCCESS ]; then
|
||||
ocf_log info "OpenStack Nova Network (nova-network) already running"
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
|
||||
nova_network_cleanup
|
||||
sleep 2
|
||||
|
||||
# run the actual nova-network daemon. Don't use ocf_run as we're sending the tool's output
|
||||
# straight to /dev/null anyway and using ocf_run would break stdout-redirection here.
|
||||
su ${OCF_RESKEY_user} -s /bin/sh -c "${OCF_RESKEY_binary} --config-file=$OCF_RESKEY_config \
|
||||
$OCF_RESKEY_additional_parameters"' >> /dev/null 2>&1 & echo $!' > $OCF_RESKEY_pid
|
||||
|
||||
ocf_log debug "Create pid file: ${OCF_RESKEY_pid} with content $(cat ${OCF_RESKEY_pid})"
|
||||
# Note: we do NOT need to start dnsmasq here, because nova-network starts it.
|
||||
|
||||
# Spin waiting for the server to come up.
|
||||
# Let the CRM/LRM time us out if required
|
||||
while true; do
|
||||
nova_network_monitor
|
||||
rc=$?
|
||||
[ $rc -eq $OCF_SUCCESS ] && break
|
||||
if [ $rc -ne $OCF_NOT_RUNNING ]; then
|
||||
ocf_log err "OpenStack Nova Network (nova-network) start failed"
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
sleep 3
|
||||
done
|
||||
|
||||
ocf_log info "OpenStack Nova Network (nova-network) started"
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
nova_network_stop() {
|
||||
local rc
|
||||
local pid
|
||||
|
||||
nova_network_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_NOT_RUNNING ]; then
|
||||
nova_network_cleanup
|
||||
sleep 2
|
||||
ocf_log info "OpenStack Nova Network (nova-network) already stopped"
|
||||
return $OCF_SUCCESS
|
||||
fi
|
||||
|
||||
# Try SIGTERM
|
||||
pid=`cat $OCF_RESKEY_pid`
|
||||
ocf_run kill -s TERM $pid
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ]; then
|
||||
ocf_log err "OpenStack Nova Network (nova-network) couldn't be stopped"
|
||||
exit $OCF_ERR_GENERIC
|
||||
fi
|
||||
|
||||
# stop waiting
|
||||
shutdown_timeout=15
|
||||
if [ -n "$OCF_RESKEY_CRM_meta_timeout" ]; then
|
||||
shutdown_timeout=$((($OCF_RESKEY_CRM_meta_timeout/1000)-5))
|
||||
fi
|
||||
count=0
|
||||
while [ $count -lt $shutdown_timeout ]; do
|
||||
nova_network_status
|
||||
rc=$?
|
||||
if [ $rc -eq $OCF_NOT_RUNNING ]; then
|
||||
break
|
||||
fi
|
||||
count=`expr $count + 1`
|
||||
sleep 1
|
||||
ocf_log debug "OpenStack Nova Network (nova-network) still hasn't stopped yet. Waiting ..."
|
||||
done
|
||||
|
||||
nova_network_status
|
||||
rc=$?
|
||||
if [ $rc -ne $OCF_NOT_RUNNING ]; then
|
||||
# SIGTERM didn't help either, try SIGKILL
|
||||
ocf_log info "OpenStack Nova Network (nova-network) failed to stop after ${shutdown_timeout}s \
|
||||
using SIGTERM. Trying SIGKILL ..."
|
||||
ocf_run kill -s KILL $pid
|
||||
fi
|
||||
|
||||
ocf_log info "OpenStack Nova Network (nova-network) stopped"
|
||||
|
||||
ocf_log debug "Delete pid file: ${OCF_RESKEY_pid} with content $(cat ${OCF_RESKEY_pid})"
|
||||
rm -f $OCF_RESKEY_pid
|
||||
|
||||
nova_network_cleanup
|
||||
sleep 2
|
||||
|
||||
return $OCF_SUCCESS
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
|
||||
case "$1" in
|
||||
meta-data) meta_data
|
||||
exit $OCF_SUCCESS;;
|
||||
usage|help) usage
|
||||
exit $OCF_SUCCESS;;
|
||||
esac
|
||||
|
||||
# Anything except meta-data and help must pass validation
|
||||
nova_network_validate || exit $?
|
||||
|
||||
# What kind of method was invoked?
|
||||
case "$1" in
|
||||
start) nova_network_start;;
|
||||
stop) nova_network_stop;;
|
||||
status) nova_network_status;;
|
||||
monitor) nova_network_monitor;;
|
||||
validate-all) ;;
|
||||
*) usage
|
||||
exit $OCF_ERR_UNIMPLEMENTED;;
|
||||
esac
|
||||
@@ -27,17 +27,8 @@ class vmware::ceilometer (
|
||||
ensure => present
|
||||
}
|
||||
|
||||
file { 'ceilometer-agent-compute-ocf':
|
||||
path =>'/usr/lib/ocf/resource.d/fuel/ceilometer-agent-compute',
|
||||
mode => '0755',
|
||||
owner => root,
|
||||
group => root,
|
||||
source => 'puppet:///modules/vmware/ocf/ceilometer-agent-compute',
|
||||
}
|
||||
|
||||
create_resources(vmware::ceilometer::ha, parse_vcenter_settings($vcenter_settings))
|
||||
|
||||
Package['ceilometer-agent-compute']->
|
||||
File['ceilometer-agent-compute-ocf']->
|
||||
Vmware::Ceilometer::Ha<||>
|
||||
}
|
||||
|
||||
@@ -78,20 +78,11 @@ class vmware::controller (
|
||||
enable => false
|
||||
}
|
||||
|
||||
file { 'vcenter-nova-compute-ocf':
|
||||
path => '/usr/lib/ocf/resource.d/fuel/nova-compute',
|
||||
source => 'puppet:///modules/vmware/ocf/nova-compute',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
}
|
||||
|
||||
# Create nova-compute per vsphere cluster
|
||||
create_resources(vmware::compute::ha, parse_vcenter_settings($vcenter_settings))
|
||||
|
||||
Package['nova-compute']->
|
||||
Service['nova-compute']->
|
||||
File['vcenter-nova-compute-ocf']->
|
||||
Vmware::Compute::Ha<||>->
|
||||
|
||||
# network configuration
|
||||
|
||||
@@ -89,14 +89,6 @@ class vmware::network::nova (
|
||||
}
|
||||
}
|
||||
|
||||
file { 'vcenter-nova-network-ocf':
|
||||
path => '/usr/lib/ocf/resource.d/fuel/nova-network',
|
||||
source => 'puppet:///modules/vmware/ocf/nova-network',
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0755',
|
||||
}
|
||||
|
||||
service { 'p_vcenter_nova_network':
|
||||
ensure => 'running',
|
||||
enable => true,
|
||||
@@ -120,7 +112,6 @@ class vmware::network::nova (
|
||||
Anchor['vcenter-nova-network-start']->
|
||||
Package['nova-network']->
|
||||
Service['nova-network']->
|
||||
File['vcenter-nova-network-ocf']->
|
||||
File["${nova_network_config_dir}"]->
|
||||
File["${nova_network_config_ha}"]->
|
||||
Cs_resource['p_vcenter_nova_network']->
|
||||
|
||||
@@ -14,12 +14,4 @@ describe 'vmware::ceilometer' do
|
||||
})
|
||||
end
|
||||
|
||||
context 'in HA deployment mode' do
|
||||
it 'should install ceilometer-agent-compute OCF script' do
|
||||
should contain_file('ceilometer-agent-compute-ocf').with({
|
||||
'path' => '/usr/lib/ocf/resource.d/fuel/ceilometer-agent-compute',
|
||||
'source' => 'puppet:///modules/vmware/ocf/ceilometer-agent-compute',
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -9,15 +9,6 @@ describe 'vmware::controller' do
|
||||
})
|
||||
end
|
||||
|
||||
context 'in HA deployment mode' do
|
||||
it 'should install nova-compute OCF script' do
|
||||
should contain_file('vcenter-nova-compute-ocf').with({
|
||||
'path' => '/usr/lib/ocf/resource.d/fuel/nova-compute',
|
||||
'source' => 'puppet:///modules/vmware/ocf/nova-compute',
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
it 'must properly configure novncproxy_base_url' do
|
||||
should contain_nova_config('DEFAULT/novncproxy_base_url').with({
|
||||
'value' => "http://0.0.0.0:6080/vnc_auto.html",
|
||||
|
||||
Reference in New Issue
Block a user