From 64be08fac8223ab53b806eaa740622d65031fc59 Mon Sep 17 00:00:00 2001 From: Norbert Illes Date: Wed, 27 Jan 2016 10:43:22 +0100 Subject: [PATCH] Remove trailing whitespaces This commit removes hopefully all trailing whitespaces from all files in the repository. Change-Id: I248160ee767e13c34c1cd19745c5496a4bcbba0b Signed-off-by: Norbert Illes --- Makefile | 12 ++++----- debian/control | 6 ++--- debian/copyright | 4 +-- debian/rules | 2 +- ocf/NovaCompute | 4 +-- ocf/NovaEvacuate | 10 +++---- ocf/ceilometer-agent-central | 4 +-- ocf/cinder-api | 8 +++--- ocf/cinder-volume | 18 ++++++------- ocf/glance-api | 4 +-- ocf/glance-registry | 6 ++--- ocf/heat-engine | 36 ++++++++++++------------- ocf/keystone | 6 ++--- ocf/neutron-agent-dhcp | 22 +++++++-------- ocf/neutron-agent-l3 | 22 +++++++-------- ocf/neutron-metadata-agent | 18 ++++++------- ocf/neutron-server | 8 +++--- ocf/nova-api | 8 +++--- ocf/nova-cert | 52 ++++++++++++++++++------------------ ocf/nova-consoleauth | 52 ++++++++++++++++++------------------ ocf/nova-network | 48 ++++++++++++++++----------------- ocf/nova-novnc | 4 +-- ocf/nova-scheduler | 50 +++++++++++++++++----------------- 23 files changed, 202 insertions(+), 202 deletions(-) diff --git a/Makefile b/Makefile index ba34c0d..96395dc 100644 --- a/Makefile +++ b/Makefile @@ -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} ; \ diff --git a/debian/control b/debian/control index 1e4f8c5..23970d5 100644 --- a/debian/control +++ b/debian/control @@ -5,14 +5,14 @@ Maintainer: Martin Loschwitz 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. diff --git a/debian/copyright b/debian/copyright index bf8f0cd..0101366 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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 diff --git a/debian/rules b/debian/rules index 68449f2..f284dfc 100755 --- a/debian/rules +++ b/debian/rules @@ -10,4 +10,4 @@ # export DH_VERBOSE=1 %: - dh $@ + dh $@ diff --git a/ocf/NovaCompute b/ocf/NovaCompute index 8032c6a..716fd18 100644 --- a/ocf/NovaCompute +++ b/ocf/NovaCompute @@ -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 } diff --git a/ocf/NovaEvacuate b/ocf/NovaEvacuate index 3865cd2..9fac3a3 100644 --- a/ocf/NovaEvacuate +++ b/ocf/NovaEvacuate @@ -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 diff --git a/ocf/ceilometer-agent-central b/ocf/ceilometer-agent-central index 9c460a3..2fc46e5 100644 --- a/ocf/ceilometer-agent-central +++ b/ocf/ceilometer-agent-central @@ -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 diff --git a/ocf/cinder-api b/ocf/cinder-api index 32ab3b3..a8ad1cf 100644 --- a/ocf/cinder-api +++ b/ocf/cinder-api @@ -54,7 +54,7 @@ usage() { cat < 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. Manages the OpenStack Cinder API (cinder-api) @@ -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 diff --git a/ocf/cinder-volume b/ocf/cinder-volume index d1f6138..b4e0498 100644 --- a/ocf/cinder-volume +++ b/ocf/cinder-volume @@ -110,14 +110,14 @@ The pid file to use for this OpenStack Cinder Volume (cinder-volume) instance - - -The listening port number of the AMQP server. Mandatory to perform a monitor check - -AMQP listening port - - - + + +The listening port number of the AMQP server. Mandatory to perform a monitor check + +AMQP listening port + + + 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 diff --git a/ocf/glance-api b/ocf/glance-api index 6a3469c..d738666 100644 --- a/ocf/glance-api +++ b/ocf/glance-api @@ -53,7 +53,7 @@ usage() { cat < 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. Manages the OpenStack ImageService (glance-api) diff --git a/ocf/glance-registry b/ocf/glance-registry index bd13c4f..053f3c4 100644 --- a/ocf/glance-registry +++ b/ocf/glance-registry @@ -55,7 +55,7 @@ usage() { cat < 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. Manages the OpenStack ImageService (glance-registry) @@ -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 diff --git a/ocf/heat-engine b/ocf/heat-engine index 7b24743..4315c73 100644 --- a/ocf/heat-engine +++ b/ocf/heat-engine @@ -52,7 +52,7 @@ usage() { cat < 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. Manages the OpenStack Orchestration Engine Service (heat-engine) @@ -111,21 +111,21 @@ The pid file to use for this OpenStack Orchestration Engine Service (heat-engine - - -The listening port number of the AMQP server. Use for monitoring purposes - -AMQP listening port - - + + +The listening port number of the AMQP server. Use for monitoring purposes + +AMQP listening port + + - - -If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes - -Zero-MQ usage - - + + +If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes + +Zero-MQ usage + + @@ -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 diff --git a/ocf/keystone b/ocf/keystone index 58c28e8..396bc46 100644 --- a/ocf/keystone +++ b/ocf/keystone @@ -53,7 +53,7 @@ usage() { cat < 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. Manages the OpenStack Identity Service (Keystone) @@ -252,7 +252,7 @@ keystone_monitor() { return $OCF_NOT_RUNNING fi fi - + ocf_log debug "OpenStack Identity (Keystone) monitor succeeded" return $OCF_SUCCESS } diff --git a/ocf/neutron-agent-dhcp b/ocf/neutron-agent-dhcp index 446bfdf..f450173 100644 --- a/ocf/neutron-agent-dhcp +++ b/ocf/neutron-agent-dhcp @@ -52,7 +52,7 @@ usage() { cat < 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. Manages the OpenStack DHCP Service (neutron-dhcp-agent) @@ -117,15 +117,15 @@ The pid file to use for this OpenStack DHCP Service (neutron-dhcp-agent) instanc OpenStack DHCP Service (neutron-dhcp-agent) pid file - + - - -The listening port number of the AMQP server. Mandatory to perform a monitor check - -AMQP listening port - - + + +The listening port number of the AMQP server. Mandatory to perform a monitor check + +AMQP listening port + + @@ -204,7 +204,7 @@ neutron_dhcp_agent_monitor() { local rc local pid local network_amqp_check - + neutron_dhcp_agent_status rc=$? diff --git a/ocf/neutron-agent-l3 b/ocf/neutron-agent-l3 index b91042a..4db7140 100644 --- a/ocf/neutron-agent-l3 +++ b/ocf/neutron-agent-l3 @@ -54,7 +54,7 @@ usage() { cat < 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. Manages the OpenStack L3 Service (neutron-l3-agent) @@ -119,15 +119,15 @@ The pid file to use for this OpenStack L3 Service (neutron-l3-agent) instance OpenStack L3 Service (neutron-l3-agent) pid file - + - - -The listening port number of the AMQP server. Mandatory to perform a monitor check - -AMQP listening port - - + + +The listening port number of the AMQP server. Mandatory to perform a monitor check + +AMQP listening port + + @@ -206,7 +206,7 @@ neutron_l3_agent_monitor() { local rc local pid local network_amqp_check - + neutron_l3_agent_status rc=$? diff --git a/ocf/neutron-metadata-agent b/ocf/neutron-metadata-agent index 27c4aab..b3eb8ed 100644 --- a/ocf/neutron-metadata-agent +++ b/ocf/neutron-metadata-agent @@ -116,14 +116,14 @@ The pid file to use for this OpenStack Neutron Metadata Agent (neutron-metadata- - - -The listening port number of the AMQP server. Mandatory to perform a monitor check - -AMQP listening port - - - + + +The listening port number of the AMQP server. Mandatory to perform a monitor check + +AMQP listening port + + + @@ -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 diff --git a/ocf/neutron-server b/ocf/neutron-server index da1f28f..1d7c69a 100644 --- a/ocf/neutron-server +++ b/ocf/neutron-server @@ -58,7 +58,7 @@ usage() { cat < 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. Manages the OpenStack Neutron Server (neutron-server) @@ -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 diff --git a/ocf/nova-api b/ocf/nova-api index 54a18a6..3f899da 100644 --- a/ocf/nova-api +++ b/ocf/nova-api @@ -54,7 +54,7 @@ usage() { cat < 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. Manages the OpenStack Nova API (nova-api) @@ -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 diff --git a/ocf/nova-cert b/ocf/nova-cert index 0c0b117..a6547ce 100644 --- a/ocf/nova-cert +++ b/ocf/nova-cert @@ -55,7 +55,7 @@ usage() { cat < 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. Manages the OpenStack Nova Cert (nova-cert) @@ -114,28 +114,28 @@ The pid file to use for this OpenStack Nova Cert (nova-cert) instance - - -The listening port number of the database server. Mandatory to perform a monitor check - -Database listening port - - + + +The listening port number of the database server. Mandatory to perform a monitor check + +Database listening port + + - - -The listening port number of the AMQP server. Mandatory to perform a monitor check - -AMQP listening port - - + + +The listening port number of the AMQP server. Mandatory to perform a monitor check + +AMQP listening port + + - - -If zeromq is used, this will disable the connection test to the AMQP server - -Zero-MQ usage - + + +If zeromq is used, this will disable the connection test to the AMQP server + +Zero-MQ usage + @@ -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 } diff --git a/ocf/nova-consoleauth b/ocf/nova-consoleauth index 80aeec9..bd446f2 100644 --- a/ocf/nova-consoleauth +++ b/ocf/nova-consoleauth @@ -55,7 +55,7 @@ usage() { cat < 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. Manages the OpenStack Nova Console Auth (nova-consoleauth) @@ -114,28 +114,28 @@ The pid file to use for this OpenStack Nova Console Auth (nova-consoleauth) inst - - -The listening port number of the database server. Mandatory to perform a monitor check - -Database listening port - - + + +The listening port number of the database server. Mandatory to perform a monitor check + +Database listening port + + - - -The listening port number of the AMQP server. Mandatory to perform a monitor check - -AMQP listening port - - + + +The listening port number of the AMQP server. Mandatory to perform a monitor check + +AMQP listening port + + - - -If zeromq is used, this will disable the connection test to the AMQP server - -Zero-MQ usage - + + +If zeromq is used, this will disable the connection test to the AMQP server + +Zero-MQ usage + @@ -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 } diff --git a/ocf/nova-network b/ocf/nova-network index 05da38b..1312357 100644 --- a/ocf/nova-network +++ b/ocf/nova-network @@ -56,7 +56,7 @@ usage() { cat < 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. Manages the OpenStack Network Service (nova-network) @@ -115,29 +115,29 @@ The pid file to use for this OpenStack Network Service (nova-network) instance - - -The listening port number of the database server. Mandatory to perform a monitor check - -Database listening port - - + + +The listening port number of the database server. Mandatory to perform a monitor check + +Database listening port + + - - -The listening port number of the AMQP server. Mandatory to perform a monitor check - -AMQP listening port - - + + +The listening port number of the AMQP server. Mandatory to perform a monitor check + +AMQP listening port + + - - -If zeromq is used, this will disable the connection test to the AMQP server - -Zero-MQ usage - - + + +If zeromq is used, this will disable the connection test to the AMQP server + +Zero-MQ usage + + @@ -218,7 +218,7 @@ nova_network_monitor() { local rc_amqp local network_db_check local network_amqp_check - + nova_network_status rc=$? diff --git a/ocf/nova-novnc b/ocf/nova-novnc index 41dc49a..f507d5f 100644 --- a/ocf/nova-novnc +++ b/ocf/nova-novnc @@ -52,7 +52,7 @@ usage() { cat < 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. Manages the OpenStack Nova VNC Console (nova-novncproxy) diff --git a/ocf/nova-scheduler b/ocf/nova-scheduler index cb5ad61..8fc43b8 100644 --- a/ocf/nova-scheduler +++ b/ocf/nova-scheduler @@ -56,7 +56,7 @@ usage() { cat < 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. Manages the OpenStack Scheduler Service (nova-scheduler) @@ -115,29 +115,29 @@ The pid file to use for this OpenStack Scheduler Service (nova-scheduler) instan - - -The listening port number of the database server. Use for monitoring purposes - -Database listening port - - + + +The listening port number of the database server. Use for monitoring purposes + +Database listening port + + - - -The listening port number of the AMQP server. Use for monitoring purposes - -AMQP listening port - - + + +The listening port number of the AMQP server. Use for monitoring purposes + +AMQP listening port + + - - -If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes - -Zero-MQ usage - - + + +If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes + +Zero-MQ usage + + @@ -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