Remove trailing whitespaces

This commit removes hopefully all trailing whitespaces from all files in
the repository.

Change-Id: I248160ee767e13c34c1cd19745c5496a4bcbba0b
Signed-off-by: Norbert Illes <norbert.e.illes@ericsson.com>
This commit is contained in:
Norbert Illes 2016-01-27 10:43:22 +01:00
parent 8906297008
commit 64be08fac8
23 changed files with 202 additions and 202 deletions

View File

@ -10,18 +10,18 @@
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an "AS
# IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an "AS
# IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language
# governing permissions and limitations under the License.
# define some common variables
INSTALL = /usr/bin/install
default:
install:
install:
mkdir -p $(DESTDIR)/usr/lib/ocf/resource.d/openstack
for file in ocf/*; do \
$(INSTALL) -t $(DESTDIR)/usr/lib/ocf/resource.d/openstack -m 0755 $${file} ; \

6
debian/control vendored
View File

@ -5,14 +5,14 @@ Maintainer: Martin Loschwitz <madkiss@debian.org>
Build-Depends: debhelper (>= 9.0.0)
Standards-Version: 3.9.3
Homepage: http://github.com/madkiss/openstack-resource-agents
#Vcs-Git: git://github.com/madkiss/openstack-resource-agents.git
#Vcs-Git: git://github.com/madkiss/openstack-resource-agents.git
Package: openstack-resource-agents
Architecture: all
Depends: ${misc:Depends}, netstat, python-keystoneclient, python-glanceclient, python-novaclient, curl
Description: pacemaker resource agents for OpenStack
This package contains resource agents to run most of the OpenStack
components inside a pacemaker-controlled high availability cluster.
components inside a pacemaker-controlled high availability cluster.
Agents for the following OpenStack components are included:
.
* glance-api
@ -27,6 +27,6 @@ Description: pacemaker resource agents for OpenStack
* nova-scheduler
* nova-volume
* quantum-server
.
.
Install this package if you want this computer to act as member
of a pacemaker HA cluster running OpenStack components.

4
debian/copyright vendored
View File

@ -7,10 +7,10 @@ Copyright: 2012 hastexo Professional Services GmbH
License: Apache
Files: ocf/nova-api ocf/nova-cert ocf/nova-consoleauth ocf/nova-novnc ocf/nova-scheduler
Copyright: 2012 Sebastien Han
Copyright: 2012 Sebastien Han
License: Apache
Files: ocf/quantum-server
Files: ocf/quantum-server
Copyright: 2012 Emilien Macchi
License: Apache

2
debian/rules vendored
View File

@ -10,4 +10,4 @@
# export DH_VERBOSE=1
%:
dh $@
dh $@

View File

@ -213,14 +213,14 @@ nova_start() {
nova_stop() {
pid=$(nova_pid)
if [ "x$pid" != x ]; then
su nova -c "kill -TERM $pid" -s /bin/bash
su nova -c "kill -TERM $pid" -s /bin/bash
fi
while [ "x$pid" != x ]; do
sleep 1
pid=$(nova_pid)
done
return $OCF_SUCCESS
}

View File

@ -151,7 +151,7 @@ update_evacuation() {
handle_evacuations() {
while [ $# -gt 0 ]; do
node=$1
node=$1
state=$2
shift; shift;
need_evacuate=0
@ -159,18 +159,18 @@ handle_evacuations() {
case $state in
"") ;;
no) ocf_log debug "$node is either fine or already handled";;
yes) need_evacuate=1;;
yes) need_evacuate=1;;
*@*)
where=$(echo $state | awk -F@ '{print $1}')
when=$(echo $state | awk -F@ '{print $2}')
now=$(date +%s)
if [ $(($now - $when)) -gt 60 ]; then
ocf_log info "Processing partial evacuation of $node by $where at $when"
ocf_log info "Processing partial evacuation of $node by $where at $when"
need_evacuate=1
else
# Give some time for any in-flight evacuations to either complete or fail
# Nova won't react well if there are two overlapping requests
# Nova won't react well if there are two overlapping requests
ocf_log info "Deferring processing partial evacuation of $node by $where at $when"
fi
;;
@ -234,7 +234,7 @@ evacuate_validate() {
check_binary fence_compute
# Is the state directory writable?
# Is the state directory writable?
state_dir=$(dirname $statefile)
touch "$state_dir/$$"
if [ $? != 0 ]; then

View File

@ -151,7 +151,7 @@ ceilometer_agent_central_check_port() {
local int
local cnt
int="$1"
cnt=${#int}
echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@ -168,7 +168,7 @@ ceilometer_agent_central_validate() {
check_binary $OCF_RESKEY_binary
check_binary netstat
ceilometer_agent_central_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

View File

@ -54,7 +54,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack Cinder API (cinder-api) process as an HA resource
$0 manages an OpenStack Cinder API (cinder-api) process as an HA resource
The 'start' operation starts the cinder-api service.
The 'stop' operation stops the cinder-api service.
@ -75,7 +75,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Cinder API Service (cinder-api)
May manage a cinder-api instance or a clone set that
May manage a cinder-api instance or a clone set that
creates a distributed cinder-api cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Cinder API (cinder-api)</shortdesc>
@ -188,7 +188,7 @@ cinder_api_validate() {
check_binary grep
check_binary cut
check_binary head
# A config file on shared storage that is not available
# during probes is OK.
if [ ! -f $OCF_RESKEY_config ]; then
@ -249,7 +249,7 @@ cinder_api_monitor() {
token=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OCF_RESKEY_os_username\", \
\"password\": \"$OCF_RESKEY_os_password\"}, \"tenantName\": \"$OCF_RESKEY_os_tenant_name\"}}" \
-H "Content-type: application/json" $OCF_RESKEY_keystone_get_token_url | tr ',' '\n' | grep '"id":' \
| cut -d'"' -f4 | head --lines 1`
| cut -d'"' -f4 | head --lines 1`
http_code=`curl --write-out %{http_code} --output /dev/null -sH "X-Auth-Token: $token" $OCF_RESKEY_url`
rc=$?
if [ $rc -ne 0 ] || [ $http_code -ne 200 ]; then

View File

@ -110,14 +110,14 @@ The pid file to use for this OpenStack Cinder Volume (cinder-volume) instance
<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="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="multibackend" unique="0" required="0">
<longdesc lang="en">
If the multi-backend is enabled, the monitor check is slightly different since cinder-volume spawns one thread for each backend.
@ -156,7 +156,7 @@ cinder_volume_validate() {
check_binary $OCF_RESKEY_binary
check_binary netstat
# A config file on shared storage that is not available
# during probes is OK.
if [ ! -f $OCF_RESKEY_config ]; then

View File

@ -53,7 +53,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack ImageService (glance-api) process as an HA resource
$0 manages an OpenStack ImageService (glance-api) process as an HA resource
The 'start' operation starts the imaging service.
The 'stop' operation stops the imaging service.
@ -74,7 +74,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack ImageService Service (glance-api)
May manage a glance-api instance or a clone set that
May manage a glance-api instance or a clone set that
creates a distributed glance-api cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack ImageService (glance-api)</shortdesc>

View File

@ -55,7 +55,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack ImageService (glance-registry) process as an HA resource
$0 manages an OpenStack ImageService (glance-registry) process as an HA resource
The 'start' operation starts the imaging service.
The 'stop' operation stops the imaging service.
@ -76,7 +76,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack ImageService Service (glance-registry)
May manage a glance-registry instance or a clone set that
May manage a glance-registry instance or a clone set that
creates a distributed glance-registry cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack ImageService (glance-registry)</shortdesc>
@ -251,7 +251,7 @@ glance_registry_monitor() {
token=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OCF_RESKEY_os_username\", \
\"password\": \"$OCF_RESKEY_os_password\"}, \"tenantName\": \"$OCF_RESKEY_os_tenant_name\"}}" \
-H "Content-type: application/json" $OCF_RESKEY_keystone_get_token_url | tr ',' '\n' | grep '"id":' \
| cut -d'"' -f4 | head --lines 1`
| cut -d'"' -f4 | head --lines 1`
http_code=`curl --write-out %{http_code} --output /dev/null -sH "X-Auth-Token: $token" $OCF_RESKEY_url`
rc=$?
if [ $rc -ne 0 ] || [ $http_code -ne 200 ]; then

View File

@ -52,7 +52,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack Orchestration Engine Service (heat-engine) process as an HA resource
$0 manages an OpenStack Orchestration Engine Service (heat-engine) process as an HA resource
The 'start' operation starts the heat-engine service.
The 'stop' operation stops the heat-engine service.
@ -73,7 +73,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Orchestration Engine Service (heat-engine)
May manage a heat-engine instance or a clone set that
May manage a heat-engine instance or a clone set that
creates a distributed heat-engine cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Orchestration Engine Service (heat-engine)</shortdesc>
@ -111,21 +111,21 @@ The pid file to use for this OpenStack Orchestration Engine Service (heat-engine
<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="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="zeromq" unique="0" required="0">
<longdesc lang="en">
If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes
</longdesc>
<shortdesc lang="en">Zero-MQ usage</shortdesc>
<content type="boolean" default="${OCF_RESKEY_zeromq_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. Use for monitoring purposes
</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">
@ -160,7 +160,7 @@ heat_engine_check_port() {
local int
local cnt
int="$1"
cnt=${#int}
echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@ -177,7 +177,7 @@ heat_engine_validate() {
check_binary $OCF_RESKEY_binary
check_binary netstat
heat_engine_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

View File

@ -53,7 +53,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack Keystone process as an HA resource
$0 manages an OpenStack Keystone process as an HA resource
The 'start' operation starts the identity service.
The 'stop' operation stops the identity service.
@ -74,7 +74,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Identity Service (Keystone)
May manage a keystone-all instance or a clone set that
May manage a keystone-all instance or a clone set that
creates a distributed keystone cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Identity Service (Keystone)</shortdesc>
@ -252,7 +252,7 @@ keystone_monitor() {
return $OCF_NOT_RUNNING
fi
fi
ocf_log debug "OpenStack Identity (Keystone) monitor succeeded"
return $OCF_SUCCESS
}

View File

@ -52,7 +52,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack DHCP Service (neutron-dhcp-agent) process as an HA resource
$0 manages an OpenStack DHCP Service (neutron-dhcp-agent) process as an HA resource
The 'start' operation starts the networking service.
The 'stop' operation stops the networking service.
@ -73,7 +73,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Neutron DHCP Service (neutron-dhcp-agent)
May manage a neutron-dhcp-agent instance or a clone set that
May manage a neutron-dhcp-agent instance or a clone set that
creates a distributed neutron-dhcp-agent cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack DHCP Service (neutron-dhcp-agent)</shortdesc>
@ -117,15 +117,15 @@ The pid file to use for this OpenStack DHCP Service (neutron-dhcp-agent) instanc
</longdesc>
<shortdesc lang="en">OpenStack DHCP Service (neutron-dhcp-agent) pid file</shortdesc>
<content type="string" default="${OCF_RESKEY_pid_default}" />
</parameter>
</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="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="additional_parameters" unique="0" required="0">
@ -204,7 +204,7 @@ neutron_dhcp_agent_monitor() {
local rc
local pid
local network_amqp_check
neutron_dhcp_agent_status
rc=$?

View File

@ -54,7 +54,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack L3 Service (neutron-l3-agent) process as an HA resource
$0 manages an OpenStack L3 Service (neutron-l3-agent) process as an HA resource
The 'start' operation starts the networking service.
The 'stop' operation stops the networking service.
@ -75,7 +75,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Neutron L3 Service (neutron-l3-agent)
May manage a neutron-l3-agent instance or a clone set that
May manage a neutron-l3-agent instance or a clone set that
creates a distributed neutron-l3-agent cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack L3 Service (neutron-l3-agent)</shortdesc>
@ -119,15 +119,15 @@ The pid file to use for this OpenStack L3 Service (neutron-l3-agent) instance
</longdesc>
<shortdesc lang="en">OpenStack L3 Service (neutron-l3-agent) pid file</shortdesc>
<content type="string" default="${OCF_RESKEY_pid_default}" />
</parameter>
</parameter>
<parameter name="neutron_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_neutron_server_port_default}" />
</parameter>
<parameter name="neutron_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_neutron_server_port_default}" />
</parameter>
<parameter name="additional_parameters" unique="0" required="0">
@ -206,7 +206,7 @@ neutron_l3_agent_monitor() {
local rc
local pid
local network_amqp_check
neutron_l3_agent_status
rc=$?

View File

@ -116,14 +116,14 @@ The pid file to use for this OpenStack Neutron Metadata Agent (neutron-metadata-
<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="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="additional_parameters" unique="0" required="0">
<longdesc lang="en">
@ -155,7 +155,7 @@ neutron_metadata_agent_validate() {
check_binary $OCF_RESKEY_binary
check_binary netstat
# A config file on shared storage that is not available
# during probes is OK.
if [ ! -f $OCF_RESKEY_config ]; then

View File

@ -58,7 +58,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack Neutron Server (neutron-server) process as an HA resource
$0 manages an OpenStack Neutron Server (neutron-server) process as an HA resource
The 'start' operation starts the Neutron Server service.
The 'stop' operation stops the Neutron Server service.
@ -79,7 +79,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Neutron Server (neutron-server)
May manage a neutron-server instance or a clone set that
May manage a neutron-server instance or a clone set that
creates a distributed neutron-server cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Neutron Server (neutron-server)</shortdesc>
@ -200,7 +200,7 @@ neutron_server_validate() {
check_binary grep
check_binary cut
check_binary head
# A config file on shared storage that is not available
# during probes is OK.
if [ ! -f $OCF_RESKEY_config ]; then
@ -261,7 +261,7 @@ neutron_server_monitor() {
token=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OCF_RESKEY_os_username\", \
\"password\": \"$OCF_RESKEY_os_password\"}, \"tenantName\": \"$OCF_RESKEY_os_tenant_name\"}}" \
-H "Content-type: application/json" $OCF_RESKEY_keystone_get_token_url | tr ',' '\n' | grep '"id":' \
| cut -d'"' -f4 | head --lines 1`
| cut -d'"' -f4 | head --lines 1`
http_code=`curl --write-out %{http_code} --output /dev/null -sH "X-Auth-Token: $token" $OCF_RESKEY_url`
rc=$?
if [ $rc -ne 0 ] || [ $http_code -ne 200 ]; then

View File

@ -54,7 +54,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack NovaAPI (nova-api) process as an HA resource
$0 manages an OpenStack NovaAPI (nova-api) process as an HA resource
The 'start' operation starts the nova-api service.
The 'stop' operation stops the nova-api service.
@ -75,7 +75,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Nova API Service (nova-api)
May manage a nova-api instance or a clone set that
May manage a nova-api instance or a clone set that
creates a distributed nova-api cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Nova API (nova-api)</shortdesc>
@ -188,7 +188,7 @@ nova_api_validate() {
check_binary grep
check_binary cut
check_binary head
# A config file on shared storage that is not available
# during probes is OK.
if [ ! -f $OCF_RESKEY_config ]; then
@ -249,7 +249,7 @@ nova_api_monitor() {
token=`curl -s -d "{\"auth\":{\"passwordCredentials\": {\"username\": \"$OCF_RESKEY_os_username\", \
\"password\": \"$OCF_RESKEY_os_password\"}, \"tenantName\": \"$OCF_RESKEY_os_tenant_name\"}}" \
-H "Content-type: application/json" $OCF_RESKEY_keystone_get_token_url | tr ',' '\n' | grep '"id":' \
| cut -d'"' -f4 | head --lines 1`
| cut -d'"' -f4 | head --lines 1`
http_code=`curl --write-out %{http_code} --output /dev/null -sH "X-Auth-Token: $token" $OCF_RESKEY_url`
rc=$?
if [ $rc -ne 0 ] || [ $http_code -ne 200 ]; then

View File

@ -55,7 +55,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack Nova Cert (nova-cert) process as an HA resource
$0 manages an OpenStack Nova Cert (nova-cert) process as an HA resource
The 'start' operation starts the nova-cert service.
The 'stop' operation stops the nova-cert service.
@ -76,7 +76,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Nova Cert Service (nova-cert)
May manage a nova-cert instance or a clone set that
May manage a nova-cert instance or a clone set that
creates a distributed nova-cert cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Nova Cert (nova-cert)</shortdesc>
@ -114,28 +114,28 @@ The pid file to use for this OpenStack Nova Cert (nova-cert) instance
<content type="string" default="${OCF_RESKEY_pid_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Mandatory to perform a monitor check
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Mandatory to perform a monitor check
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_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="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 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">
@ -171,7 +171,7 @@ nova_cert_check_port() {
local int
local cnt
int="$1"
cnt=${#int}
echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@ -190,7 +190,7 @@ nova_cert_validate() {
nova_cert_check_port $OCF_RESKEY_database_server_port
nova_cert_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
@ -239,7 +239,7 @@ nova_cert_monitor() {
local rc_amqp
local cert_db_check
local cert_amqp_check
nova_cert_status
rc=$?
@ -270,7 +270,7 @@ nova_cert_monitor() {
return $OCF_NOT_RUNNING
fi
fi
ocf_log debug "OpenStack Nova Cert (nova-cert) monitor succeeded"
return $OCF_SUCCESS
}

View File

@ -55,7 +55,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack Nova ConsoleAuth (nova-consoleauth) process as an HA resource
$0 manages an OpenStack Nova ConsoleAuth (nova-consoleauth) process as an HA resource
The 'start' operation starts the nova-consoleauth service.
The 'stop' operation stops the nova-consoleauth service.
@ -76,7 +76,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Nova Console Auth Service (nova-consoleauth)
May manage a nova-consoleauth instance or a clone set that
May manage a nova-consoleauth instance or a clone set that
creates a distributed nova-consoleauth cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Nova Console Auth (nova-consoleauth)</shortdesc>
@ -114,28 +114,28 @@ The pid file to use for this OpenStack Nova Console Auth (nova-consoleauth) inst
<content type="string" default="${OCF_RESKEY_pid_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Mandatory to perform a monitor check
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Mandatory to perform a monitor check
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_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="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 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">
@ -171,7 +171,7 @@ nova_consoleauth_check_port() {
local int
local cnt
int="$1"
cnt=${#int}
echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@ -187,7 +187,7 @@ nova_consoleauth_validate() {
check_binary $OCF_RESKEY_binary
check_binary netstat
nova_consoleauth_check_port $OCF_RESKEY_database_server_port
nova_consoleauth_check_port $OCF_RESKEY_amqp_server_port
@ -239,7 +239,7 @@ nova_consoleauth_monitor() {
local rc_amqp
local console_db_check
local console_amqp_check
nova_consoleauth_status
rc=$?
@ -270,7 +270,7 @@ nova_consoleauth_monitor() {
return $OCF_NOT_RUNNING
fi
fi
ocf_log debug "OpenStack Nova Console Auth (nova-consoleauth) monitor succeeded"
return $OCF_SUCCESS
}

View File

@ -56,7 +56,7 @@ 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
$0 manages an OpenStack Network Service (nova-network) process as an HA resource
The 'start' operation starts the networking service.
The 'stop' operation stops the networking service.
@ -77,7 +77,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Nova Network Service (nova-network)
May manage a nova-network instance or a clone set that
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>
@ -115,29 +115,29 @@ The pid file to use for this OpenStack Network Service (nova-network) instance
<content type="string" default="${OCF_RESKEY_pid_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Mandatory to perform a monitor check
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Mandatory to perform a monitor check
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_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="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="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">
@ -218,7 +218,7 @@ nova_network_monitor() {
local rc_amqp
local network_db_check
local network_amqp_check
nova_network_status
rc=$?

View File

@ -52,7 +52,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack Nova VNC Console (nova-novncproxy) process as an HA resource
$0 manages an OpenStack Nova VNC Console (nova-novncproxy) process as an HA resource
The 'start' operation starts the console service.
The 'stop' operation stops the console service.
@ -73,7 +73,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Nova VNC Console Service (nova-novncproxy)
May manage a nova-novncproxy instance or a clone set that
May manage a nova-novncproxy instance or a clone set that
creates a distributed nova-novncproxy cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Nova VNC Console (nova-novncproxy)</shortdesc>

View File

@ -56,7 +56,7 @@ usage() {
cat <<UEND
usage: $0 (start|stop|validate-all|meta-data|status|monitor)
$0 manages an OpenStack SchedulerService (nova-scheduler) process as an HA resource
$0 manages an OpenStack SchedulerService (nova-scheduler) process as an HA resource
The 'start' operation starts the scheduler service.
The 'stop' operation stops the scheduler service.
@ -77,7 +77,7 @@ meta_data() {
<longdesc lang="en">
Resource agent for the OpenStack Nova Scheduler Service (nova-scheduler)
May manage a nova-scheduler instance or a clone set that
May manage a nova-scheduler instance or a clone set that
creates a distributed nova-scheduler cluster.
</longdesc>
<shortdesc lang="en">Manages the OpenStack Scheduler Service (nova-scheduler)</shortdesc>
@ -115,29 +115,29 @@ The pid file to use for this OpenStack Scheduler Service (nova-scheduler) instan
<content type="string" default="${OCF_RESKEY_pid_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Use for monitoring purposes
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
</parameter>
<parameter name="database_server_port" unique="0" required="0">
<longdesc lang="en">
The listening port number of the database server. Use for monitoring purposes
</longdesc>
<shortdesc lang="en">Database listening port</shortdesc>
<content type="integer" default="${OCF_RESKEY_database_server_port_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="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="zeromq" unique="0" required="0">
<longdesc lang="en">
If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes
</longdesc>
<shortdesc lang="en">Zero-MQ usage</shortdesc>
<content type="boolean" default="${OCF_RESKEY_zeromq_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. Use for monitoring purposes
</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">
@ -172,7 +172,7 @@ nova_scheduler_check_port() {
local int
local cnt
int="$1"
cnt=${#int}
echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@ -190,7 +190,7 @@ nova_scheduler_validate() {
check_binary netstat
nova_scheduler_check_port $OCF_RESKEY_database_server_port
nova_scheduler_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