Browse Source

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>
Norbert Illes 3 years ago
parent
commit
64be08fac8

+ 6
- 6
Makefile View File

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

+ 3
- 3
debian/control View File

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

+ 2
- 2
debian/copyright View File

@@ -7,10 +7,10 @@ Copyright: 2012 hastexo Professional Services GmbH
7 7
 License: Apache
8 8
 
9 9
 Files: ocf/nova-api ocf/nova-cert ocf/nova-consoleauth ocf/nova-novnc ocf/nova-scheduler
10
-Copyright: 2012 Sebastien Han 
10
+Copyright: 2012 Sebastien Han
11 11
 License: Apache
12 12
 
13
-Files: ocf/quantum-server 
13
+Files: ocf/quantum-server
14 14
 Copyright: 2012 Emilien Macchi
15 15
 License: Apache
16 16
 

+ 1
- 1
debian/rules View File

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

+ 2
- 2
ocf/NovaCompute View File

@@ -213,14 +213,14 @@ nova_start() {
213 213
 nova_stop() {
214 214
     pid=$(nova_pid)
215 215
     if [ "x$pid" != x ]; then
216
-	su nova -c "kill -TERM $pid" -s /bin/bash	
216
+	su nova -c "kill -TERM $pid" -s /bin/bash
217 217
     fi
218 218
 
219 219
     while [ "x$pid" != x ]; do
220 220
 	sleep 1
221 221
 	pid=$(nova_pid)
222 222
     done
223
-    
223
+
224 224
     return $OCF_SUCCESS
225 225
 }
226 226
 

+ 5
- 5
ocf/NovaEvacuate View File

@@ -151,7 +151,7 @@ update_evacuation() {
151 151
 
152 152
 handle_evacuations() {
153 153
     while [ $# -gt 0 ]; do
154
-	node=$1 
154
+	node=$1
155 155
 	state=$2
156 156
 	shift; shift;
157 157
 	need_evacuate=0
@@ -159,18 +159,18 @@ handle_evacuations() {
159 159
 	case $state in
160 160
 	    "") ;;
161 161
 	    no)  ocf_log debug "$node is either fine or already handled";;
162
-	    yes) need_evacuate=1;; 
162
+	    yes) need_evacuate=1;;
163 163
 	    *@*)
164 164
 		where=$(echo $state | awk -F@ '{print $1}')
165 165
 		when=$(echo $state | awk -F@ '{print $2}')
166 166
 		now=$(date +%s)
167 167
 
168 168
 		if [ $(($now - $when)) -gt 60 ]; then
169
-		    ocf_log info "Processing partial evacuation of $node by $where at $when"		
169
+		    ocf_log info "Processing partial evacuation of $node by $where at $when"
170 170
 		    need_evacuate=1
171 171
 		else
172 172
 		    # Give some time for any in-flight evacuations to either complete or fail
173
-		    # Nova won't react well if there are two overlapping requests 
173
+		    # Nova won't react well if there are two overlapping requests
174 174
 		    ocf_log info "Deferring processing partial evacuation of $node by $where at $when"
175 175
 		fi
176 176
 		;;
@@ -234,7 +234,7 @@ evacuate_validate() {
234 234
 
235 235
     check_binary fence_compute
236 236
 
237
-    # Is the state directory writable? 
237
+    # Is the state directory writable?
238 238
     state_dir=$(dirname $statefile)
239 239
     touch "$state_dir/$$"
240 240
     if [ $? != 0 ]; then

+ 2
- 2
ocf/ceilometer-agent-central View File

@@ -151,7 +151,7 @@ ceilometer_agent_central_check_port() {
151 151
 
152 152
     local int
153 153
     local cnt
154
-    
154
+
155 155
     int="$1"
156 156
     cnt=${#int}
157 157
     echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@@ -168,7 +168,7 @@ ceilometer_agent_central_validate() {
168 168
     check_binary $OCF_RESKEY_binary
169 169
     check_binary netstat
170 170
     ceilometer_agent_central_check_port $OCF_RESKEY_amqp_server_port
171
-    
171
+
172 172
     # A config file on shared storage that is not available
173 173
     # during probes is OK.
174 174
     if [ ! -f $OCF_RESKEY_config ]; then

+ 4
- 4
ocf/cinder-api View File

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

+ 9
- 9
ocf/cinder-volume View File

@@ -110,14 +110,14 @@ The pid file to use for this OpenStack Cinder Volume (cinder-volume) instance
110 110
 <content type="string" default="${OCF_RESKEY_pid_default}" />
111 111
 </parameter>
112 112
 
113
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
114
-<longdesc lang="en">                                                                                                                                                                                                      
115
-The listening port number of the AMQP server. Mandatory to perform a monitor check                                                                                                                                        
116
-</longdesc>                                                                                                                                                                                                               
117
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
118
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
119
-</parameter>      
120
- 
113
+<parameter name="amqp_server_port" unique="0" required="0">
114
+<longdesc lang="en">
115
+The listening port number of the AMQP server. Mandatory to perform a monitor check
116
+</longdesc>
117
+<shortdesc lang="en">AMQP listening port</shortdesc>
118
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
119
+</parameter>
120
+
121 121
 <parameter name="multibackend" unique="0" required="0">
122 122
 <longdesc lang="en">
123 123
 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() {
156 156
 
157 157
     check_binary $OCF_RESKEY_binary
158 158
     check_binary netstat
159
-    
159
+
160 160
     # A config file on shared storage that is not available
161 161
     # during probes is OK.
162 162
     if [ ! -f $OCF_RESKEY_config ]; then

+ 2
- 2
ocf/glance-api View File

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

+ 3
- 3
ocf/glance-registry View File

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

+ 19
- 19
ocf/heat-engine View File

@@ -52,7 +52,7 @@ usage() {
52 52
     cat <<UEND
53 53
         usage: $0 (start|stop|validate-all|meta-data|status|monitor)
54 54
 
55
-        $0 manages an OpenStack Orchestration Engine Service (heat-engine) process as an HA resource 
55
+        $0 manages an OpenStack Orchestration Engine Service (heat-engine) process as an HA resource
56 56
 
57 57
         The 'start' operation starts the heat-engine service.
58 58
         The 'stop' operation stops the heat-engine service.
@@ -73,7 +73,7 @@ meta_data() {
73 73
 
74 74
 <longdesc lang="en">
75 75
 Resource agent for the OpenStack Orchestration Engine Service (heat-engine)
76
-May manage a heat-engine instance or a clone set that 
76
+May manage a heat-engine instance or a clone set that
77 77
 creates a distributed heat-engine cluster.
78 78
 </longdesc>
79 79
 <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
111 111
 <content type="string" default="${OCF_RESKEY_pid_default}" />
112 112
 </parameter>
113 113
 
114
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
115
-<longdesc lang="en">                                                                                                                                                                                                      
116
-The listening port number of the AMQP server. Use for monitoring purposes                                                                                                                                        
117
-</longdesc>                                                                                                                                                                                                               
118
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
119
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
120
-</parameter>      
121
-
122
-<parameter name="zeromq" unique="0" required="0">                                                                                                                                                              
123
-<longdesc lang="en">                                                                                                                                                                                                      
124
-If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes                                                                                                                               
125
-</longdesc>                                                                                                                                                                                                               
126
-<shortdesc lang="en">Zero-MQ usage</shortdesc>                                                                                                                                                                      
127
-<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />                                                                                                                                              
128
-</parameter>  
114
+<parameter name="amqp_server_port" unique="0" required="0">
115
+<longdesc lang="en">
116
+The listening port number of the AMQP server. Use for monitoring purposes
117
+</longdesc>
118
+<shortdesc lang="en">AMQP listening port</shortdesc>
119
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
120
+</parameter>
121
+
122
+<parameter name="zeromq" unique="0" required="0">
123
+<longdesc lang="en">
124
+If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes
125
+</longdesc>
126
+<shortdesc lang="en">Zero-MQ usage</shortdesc>
127
+<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />
128
+</parameter>
129 129
 
130 130
 <parameter name="additional_parameters" unique="0" required="0">
131 131
 <longdesc lang="en">
@@ -160,7 +160,7 @@ heat_engine_check_port() {
160 160
 
161 161
     local int
162 162
     local cnt
163
-    
163
+
164 164
     int="$1"
165 165
     cnt=${#int}
166 166
     echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@@ -177,7 +177,7 @@ heat_engine_validate() {
177 177
     check_binary $OCF_RESKEY_binary
178 178
     check_binary netstat
179 179
     heat_engine_check_port $OCF_RESKEY_amqp_server_port
180
-    
180
+
181 181
     # A config file on shared storage that is not available
182 182
     # during probes is OK.
183 183
     if [ ! -f $OCF_RESKEY_config ]; then

+ 3
- 3
ocf/keystone View File

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

+ 11
- 11
ocf/neutron-agent-dhcp View File

@@ -52,7 +52,7 @@ usage() {
52 52
     cat <<UEND
53 53
         usage: $0 (start|stop|validate-all|meta-data|status|monitor)
54 54
 
55
-        $0 manages an OpenStack DHCP Service (neutron-dhcp-agent) process as an HA resource 
55
+        $0 manages an OpenStack DHCP Service (neutron-dhcp-agent) process as an HA resource
56 56
 
57 57
         The 'start' operation starts the networking service.
58 58
         The 'stop' operation stops the networking service.
@@ -73,7 +73,7 @@ meta_data() {
73 73
 
74 74
 <longdesc lang="en">
75 75
 Resource agent for the OpenStack Neutron DHCP Service (neutron-dhcp-agent)
76
-May manage a neutron-dhcp-agent instance or a clone set that 
76
+May manage a neutron-dhcp-agent instance or a clone set that
77 77
 creates a distributed neutron-dhcp-agent cluster.
78 78
 </longdesc>
79 79
 <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
117 117
 </longdesc>
118 118
 <shortdesc lang="en">OpenStack DHCP Service (neutron-dhcp-agent) pid file</shortdesc>
119 119
 <content type="string" default="${OCF_RESKEY_pid_default}" />
120
-</parameter>  
120
+</parameter>
121 121
 
122
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
123
-<longdesc lang="en">                                                                                                                                                                                                      
124
-The listening port number of the AMQP server. Mandatory to perform a monitor check                                                                                                                                        
125
-</longdesc>                                                                                                                                                                                                               
126
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
127
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
128
-</parameter>      
122
+<parameter name="amqp_server_port" unique="0" required="0">
123
+<longdesc lang="en">
124
+The listening port number of the AMQP server. Mandatory to perform a monitor check
125
+</longdesc>
126
+<shortdesc lang="en">AMQP listening port</shortdesc>
127
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
128
+</parameter>
129 129
 
130 130
 
131 131
 <parameter name="additional_parameters" unique="0" required="0">
@@ -204,7 +204,7 @@ neutron_dhcp_agent_monitor() {
204 204
     local rc
205 205
     local pid
206 206
     local network_amqp_check
207
-    
207
+
208 208
     neutron_dhcp_agent_status
209 209
     rc=$?
210 210
 

+ 11
- 11
ocf/neutron-agent-l3 View File

@@ -54,7 +54,7 @@ usage() {
54 54
     cat <<UEND
55 55
         usage: $0 (start|stop|validate-all|meta-data|status|monitor)
56 56
 
57
-        $0 manages an OpenStack L3 Service (neutron-l3-agent) process as an HA resource 
57
+        $0 manages an OpenStack L3 Service (neutron-l3-agent) process as an HA resource
58 58
 
59 59
         The 'start' operation starts the networking service.
60 60
         The 'stop' operation stops the networking service.
@@ -75,7 +75,7 @@ meta_data() {
75 75
 
76 76
 <longdesc lang="en">
77 77
 Resource agent for the OpenStack Neutron L3 Service (neutron-l3-agent)
78
-May manage a neutron-l3-agent instance or a clone set that 
78
+May manage a neutron-l3-agent instance or a clone set that
79 79
 creates a distributed neutron-l3-agent cluster.
80 80
 </longdesc>
81 81
 <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
119 119
 </longdesc>
120 120
 <shortdesc lang="en">OpenStack L3 Service (neutron-l3-agent) pid file</shortdesc>
121 121
 <content type="string" default="${OCF_RESKEY_pid_default}" />
122
-</parameter>  
122
+</parameter>
123 123
 
124
-<parameter name="neutron_server_port" unique="0" required="0">                                                                                                                                                              
125
-<longdesc lang="en">                                                                                                                                                                                                      
126
-The listening port number of the AMQP server. Mandatory to perform a monitor check                                                                                                                                        
127
-</longdesc>                                                                                                                                                                                                               
128
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
129
-<content type="integer" default="${OCF_RESKEY_neutron_server_port_default}" />                                                                                                                                              
130
-</parameter>      
124
+<parameter name="neutron_server_port" unique="0" required="0">
125
+<longdesc lang="en">
126
+The listening port number of the AMQP server. Mandatory to perform a monitor check
127
+</longdesc>
128
+<shortdesc lang="en">AMQP listening port</shortdesc>
129
+<content type="integer" default="${OCF_RESKEY_neutron_server_port_default}" />
130
+</parameter>
131 131
 
132 132
 
133 133
 <parameter name="additional_parameters" unique="0" required="0">
@@ -206,7 +206,7 @@ neutron_l3_agent_monitor() {
206 206
     local rc
207 207
     local pid
208 208
     local network_amqp_check
209
-    
209
+
210 210
     neutron_l3_agent_status
211 211
     rc=$?
212 212
 

+ 9
- 9
ocf/neutron-metadata-agent View File

@@ -116,14 +116,14 @@ The pid file to use for this OpenStack Neutron Metadata Agent (neutron-metadata-
116 116
 <content type="string" default="${OCF_RESKEY_pid_default}" />
117 117
 </parameter>
118 118
 
119
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
120
-<longdesc lang="en">                                                                                                                                                                                                      
121
-The listening port number of the AMQP server. Mandatory to perform a monitor check                                                                                                                                        
122
-</longdesc>                                                                                                                                                                                                               
123
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
124
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
125
-</parameter>      
126
- 
119
+<parameter name="amqp_server_port" unique="0" required="0">
120
+<longdesc lang="en">
121
+The listening port number of the AMQP server. Mandatory to perform a monitor check
122
+</longdesc>
123
+<shortdesc lang="en">AMQP listening port</shortdesc>
124
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
125
+</parameter>
126
+
127 127
 
128 128
 <parameter name="additional_parameters" unique="0" required="0">
129 129
 <longdesc lang="en">
@@ -155,7 +155,7 @@ neutron_metadata_agent_validate() {
155 155
 
156 156
     check_binary $OCF_RESKEY_binary
157 157
     check_binary netstat
158
-    
158
+
159 159
     # A config file on shared storage that is not available
160 160
     # during probes is OK.
161 161
     if [ ! -f $OCF_RESKEY_config ]; then

+ 4
- 4
ocf/neutron-server View File

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

+ 4
- 4
ocf/nova-api View File

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

+ 28
- 28
ocf/nova-cert View File

@@ -55,7 +55,7 @@ usage() {
55 55
     cat <<UEND
56 56
         usage: $0 (start|stop|validate-all|meta-data|status|monitor)
57 57
 
58
-        $0 manages an OpenStack Nova Cert (nova-cert) process as an HA resource 
58
+        $0 manages an OpenStack Nova Cert (nova-cert) process as an HA resource
59 59
 
60 60
         The 'start' operation starts the nova-cert service.
61 61
         The 'stop' operation stops the nova-cert service.
@@ -76,7 +76,7 @@ meta_data() {
76 76
 
77 77
 <longdesc lang="en">
78 78
 Resource agent for the OpenStack Nova Cert Service (nova-cert)
79
-May manage a nova-cert instance or a clone set that 
79
+May manage a nova-cert instance or a clone set that
80 80
 creates a distributed nova-cert cluster.
81 81
 </longdesc>
82 82
 <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
114 114
 <content type="string" default="${OCF_RESKEY_pid_default}" />
115 115
 </parameter>
116 116
 
117
-<parameter name="database_server_port" unique="0" required="0">                                                                                                                                                              
118
-<longdesc lang="en">                                                                                                                                                                                                      
119
-The listening port number of the database server. Mandatory to perform a monitor check                                                                                                                                        
120
-</longdesc>                                                                                                                                                                                                               
121
-<shortdesc lang="en">Database listening port</shortdesc>                                                                                                                                                                      
122
-<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />                                                                                                                                              
123
-</parameter>  
124
-
125
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
126
-<longdesc lang="en">                                                                                                                                                                                                      
127
-The listening port number of the AMQP server. Mandatory to perform a monitor check                                                                                                                                        
128
-</longdesc>                                                                                                                                                                                                               
129
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
130
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
131
-</parameter>  
132
-
133
-<parameter name="zeromq" unique="0" required="0">                                                                                                                                                              
134
-<longdesc lang="en">                                                                                                                                                                                                      
135
-If zeromq is used, this will disable the connection test to the AMQP server                                                                                                                                     
136
-</longdesc>                                                                                                                                                                                                               
137
-<shortdesc lang="en">Zero-MQ usage</shortdesc>                                                                                                                                                                      
138
-<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />                                                                                                                                              
117
+<parameter name="database_server_port" unique="0" required="0">
118
+<longdesc lang="en">
119
+The listening port number of the database server. Mandatory to perform a monitor check
120
+</longdesc>
121
+<shortdesc lang="en">Database listening port</shortdesc>
122
+<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
123
+</parameter>
124
+
125
+<parameter name="amqp_server_port" unique="0" required="0">
126
+<longdesc lang="en">
127
+The listening port number of the AMQP server. Mandatory to perform a monitor check
128
+</longdesc>
129
+<shortdesc lang="en">AMQP listening port</shortdesc>
130
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
131
+</parameter>
132
+
133
+<parameter name="zeromq" unique="0" required="0">
134
+<longdesc lang="en">
135
+If zeromq is used, this will disable the connection test to the AMQP server
136
+</longdesc>
137
+<shortdesc lang="en">Zero-MQ usage</shortdesc>
138
+<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />
139 139
 </parameter>
140 140
 
141 141
 <parameter name="additional_parameters" unique="0" required="0">
@@ -171,7 +171,7 @@ nova_cert_check_port() {
171 171
 
172 172
     local int
173 173
     local cnt
174
-    
174
+
175 175
     int="$1"
176 176
     cnt=${#int}
177 177
     echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@@ -190,7 +190,7 @@ nova_cert_validate() {
190 190
 
191 191
     nova_cert_check_port $OCF_RESKEY_database_server_port
192 192
     nova_cert_check_port $OCF_RESKEY_amqp_server_port
193
-    
193
+
194 194
     # A config file on shared storage that is not available
195 195
     # during probes is OK.
196 196
     if [ ! -f $OCF_RESKEY_config ]; then
@@ -239,7 +239,7 @@ nova_cert_monitor() {
239 239
     local rc_amqp
240 240
     local cert_db_check
241 241
     local cert_amqp_check
242
-    
242
+
243 243
     nova_cert_status
244 244
     rc=$?
245 245
 
@@ -270,7 +270,7 @@ nova_cert_monitor() {
270 270
 		    return $OCF_NOT_RUNNING
271 271
 		fi
272 272
 	fi
273
-    
273
+
274 274
     ocf_log debug "OpenStack Nova Cert (nova-cert) monitor succeeded"
275 275
     return $OCF_SUCCESS
276 276
 }

+ 28
- 28
ocf/nova-consoleauth View File

@@ -55,7 +55,7 @@ usage() {
55 55
     cat <<UEND
56 56
         usage: $0 (start|stop|validate-all|meta-data|status|monitor)
57 57
 
58
-        $0 manages an OpenStack Nova ConsoleAuth (nova-consoleauth) process as an HA resource 
58
+        $0 manages an OpenStack Nova ConsoleAuth (nova-consoleauth) process as an HA resource
59 59
 
60 60
         The 'start' operation starts the nova-consoleauth service.
61 61
         The 'stop' operation stops the nova-consoleauth service.
@@ -76,7 +76,7 @@ meta_data() {
76 76
 
77 77
 <longdesc lang="en">
78 78
 Resource agent for the OpenStack Nova Console Auth Service (nova-consoleauth)
79
-May manage a nova-consoleauth instance or a clone set that 
79
+May manage a nova-consoleauth instance or a clone set that
80 80
 creates a distributed nova-consoleauth cluster.
81 81
 </longdesc>
82 82
 <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
114 114
 <content type="string" default="${OCF_RESKEY_pid_default}" />
115 115
 </parameter>
116 116
 
117
-<parameter name="database_server_port" unique="0" required="0">                                                                                                                                                              
118
-<longdesc lang="en">                                                                                                                                                                                                      
119
-The listening port number of the database server. Mandatory to perform a monitor check                                                                                                                                        
120
-</longdesc>                                                                                                                                                                                                               
121
-<shortdesc lang="en">Database listening port</shortdesc>                                                                                                                                                                      
122
-<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />                                                                                                                                              
123
-</parameter>  
124
-
125
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
126
-<longdesc lang="en">                                                                                                                                                                                                      
127
-The listening port number of the AMQP server. Mandatory to perform a monitor check                                                                                                                                        
128
-</longdesc>                                                                                                                                                                                                               
129
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
130
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
131
-</parameter>  
132
-
133
-<parameter name="zeromq" unique="0" required="0">                                                                                                                                                              
134
-<longdesc lang="en">                                                                                                                                                                                                      
135
-If zeromq is used, this will disable the connection test to the AMQP server                                                                                                                                    
136
-</longdesc>                                                                                                                                                                                                               
137
-<shortdesc lang="en">Zero-MQ usage</shortdesc>                                                                                                                                                                      
138
-<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />                                                                                                                                              
117
+<parameter name="database_server_port" unique="0" required="0">
118
+<longdesc lang="en">
119
+The listening port number of the database server. Mandatory to perform a monitor check
120
+</longdesc>
121
+<shortdesc lang="en">Database listening port</shortdesc>
122
+<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
123
+</parameter>
124
+
125
+<parameter name="amqp_server_port" unique="0" required="0">
126
+<longdesc lang="en">
127
+The listening port number of the AMQP server. Mandatory to perform a monitor check
128
+</longdesc>
129
+<shortdesc lang="en">AMQP listening port</shortdesc>
130
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
131
+</parameter>
132
+
133
+<parameter name="zeromq" unique="0" required="0">
134
+<longdesc lang="en">
135
+If zeromq is used, this will disable the connection test to the AMQP server
136
+</longdesc>
137
+<shortdesc lang="en">Zero-MQ usage</shortdesc>
138
+<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />
139 139
 </parameter>
140 140
 
141 141
 <parameter name="additional_parameters" unique="0" required="0">
@@ -171,7 +171,7 @@ nova_consoleauth_check_port() {
171 171
 
172 172
     local int
173 173
     local cnt
174
-    
174
+
175 175
     int="$1"
176 176
     cnt=${#int}
177 177
     echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@@ -187,7 +187,7 @@ nova_consoleauth_validate() {
187 187
 
188 188
     check_binary $OCF_RESKEY_binary
189 189
     check_binary netstat
190
-    
190
+
191 191
     nova_consoleauth_check_port $OCF_RESKEY_database_server_port
192 192
     nova_consoleauth_check_port $OCF_RESKEY_amqp_server_port
193 193
 
@@ -239,7 +239,7 @@ nova_consoleauth_monitor() {
239 239
     local rc_amqp
240 240
     local console_db_check
241 241
     local console_amqp_check
242
-    
242
+
243 243
     nova_consoleauth_status
244 244
     rc=$?
245 245
 
@@ -270,7 +270,7 @@ nova_consoleauth_monitor() {
270 270
 		    return $OCF_NOT_RUNNING
271 271
 		fi
272 272
 	fi
273
-    
273
+
274 274
     ocf_log debug "OpenStack Nova Console Auth (nova-consoleauth) monitor succeeded"
275 275
     return $OCF_SUCCESS
276 276
 }

+ 26
- 26
ocf/nova-network View File

@@ -56,7 +56,7 @@ usage() {
56 56
     cat <<UEND
57 57
         usage: $0 (start|stop|validate-all|meta-data|status|monitor)
58 58
 
59
-        $0 manages an OpenStack Network Service (nova-network) process as an HA resource 
59
+        $0 manages an OpenStack Network Service (nova-network) process as an HA resource
60 60
 
61 61
         The 'start' operation starts the networking service.
62 62
         The 'stop' operation stops the networking service.
@@ -77,7 +77,7 @@ meta_data() {
77 77
 
78 78
 <longdesc lang="en">
79 79
 Resource agent for the OpenStack Nova Network Service (nova-network)
80
-May manage a nova-network instance or a clone set that 
80
+May manage a nova-network instance or a clone set that
81 81
 creates a distributed nova-network cluster.
82 82
 </longdesc>
83 83
 <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
115 115
 <content type="string" default="${OCF_RESKEY_pid_default}" />
116 116
 </parameter>
117 117
 
118
-<parameter name="database_server_port" unique="0" required="0">                                                                                                                                                              
119
-<longdesc lang="en">                                                                                                                                                                                                      
120
-The listening port number of the database server. Mandatory to perform a monitor check                                                                                                                                        
121
-</longdesc>                                                                                                                                                                                                               
122
-<shortdesc lang="en">Database listening port</shortdesc>                                                                                                                                                                      
123
-<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />                                                                                                                                              
124
-</parameter>  
125
-
126
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
127
-<longdesc lang="en">                                                                                                                                                                                                      
128
-The listening port number of the AMQP server. Mandatory to perform a monitor check                                                                                                                                        
129
-</longdesc>                                                                                                                                                                                                               
130
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
131
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
132
-</parameter>      
133
-
134
-<parameter name="zeromq" unique="0" required="0">                                                                                                                                                              
135
-<longdesc lang="en">                                                                                                                                                                                                      
136
-If zeromq is used, this will disable the connection test to the AMQP server                                                                                                                                     
137
-</longdesc>                                                                                                                                                                                                               
138
-<shortdesc lang="en">Zero-MQ usage</shortdesc>                                                                                                                                                                      
139
-<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />                                                                                                                                              
140
-</parameter>  
118
+<parameter name="database_server_port" unique="0" required="0">
119
+<longdesc lang="en">
120
+The listening port number of the database server. Mandatory to perform a monitor check
121
+</longdesc>
122
+<shortdesc lang="en">Database listening port</shortdesc>
123
+<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
124
+</parameter>
125
+
126
+<parameter name="amqp_server_port" unique="0" required="0">
127
+<longdesc lang="en">
128
+The listening port number of the AMQP server. Mandatory to perform a monitor check
129
+</longdesc>
130
+<shortdesc lang="en">AMQP listening port</shortdesc>
131
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
132
+</parameter>
133
+
134
+<parameter name="zeromq" unique="0" required="0">
135
+<longdesc lang="en">
136
+If zeromq is used, this will disable the connection test to the AMQP server
137
+</longdesc>
138
+<shortdesc lang="en">Zero-MQ usage</shortdesc>
139
+<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />
140
+</parameter>
141 141
 
142 142
 <parameter name="additional_parameters" unique="0" required="0">
143 143
 <longdesc lang="en">
@@ -218,7 +218,7 @@ nova_network_monitor() {
218 218
     local rc_amqp
219 219
     local network_db_check
220 220
     local network_amqp_check
221
-    
221
+
222 222
     nova_network_status
223 223
     rc=$?
224 224
 

+ 2
- 2
ocf/nova-novnc View File

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

+ 27
- 27
ocf/nova-scheduler View File

@@ -56,7 +56,7 @@ usage() {
56 56
     cat <<UEND
57 57
         usage: $0 (start|stop|validate-all|meta-data|status|monitor)
58 58
 
59
-        $0 manages an OpenStack SchedulerService (nova-scheduler) process as an HA resource 
59
+        $0 manages an OpenStack SchedulerService (nova-scheduler) process as an HA resource
60 60
 
61 61
         The 'start' operation starts the scheduler service.
62 62
         The 'stop' operation stops the scheduler service.
@@ -77,7 +77,7 @@ meta_data() {
77 77
 
78 78
 <longdesc lang="en">
79 79
 Resource agent for the OpenStack Nova Scheduler Service (nova-scheduler)
80
-May manage a nova-scheduler instance or a clone set that 
80
+May manage a nova-scheduler instance or a clone set that
81 81
 creates a distributed nova-scheduler cluster.
82 82
 </longdesc>
83 83
 <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
115 115
 <content type="string" default="${OCF_RESKEY_pid_default}" />
116 116
 </parameter>
117 117
 
118
-<parameter name="database_server_port" unique="0" required="0">                                                                                                                                                              
119
-<longdesc lang="en">                                                                                                                                                                                                      
120
-The listening port number of the database server. Use for monitoring purposes                                                                                                                                        
121
-</longdesc>                                                                                                                                                                                                               
122
-<shortdesc lang="en">Database listening port</shortdesc>                                                                                                                                                                      
123
-<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />                                                                                                                                              
124
-</parameter>  
125
-
126
-<parameter name="amqp_server_port" unique="0" required="0">                                                                                                                                                              
127
-<longdesc lang="en">                                                                                                                                                                                                      
128
-The listening port number of the AMQP server. Use for monitoring purposes                                                                                                                                        
129
-</longdesc>                                                                                                                                                                                                               
130
-<shortdesc lang="en">AMQP listening port</shortdesc>                                                                                                                                                                      
131
-<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />                                                                                                                                              
132
-</parameter>      
133
-
134
-<parameter name="zeromq" unique="0" required="0">                                                                                                                                                              
135
-<longdesc lang="en">                                                                                                                                                                                                      
136
-If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes                                                                                                                               
137
-</longdesc>                                                                                                                                                                                                               
138
-<shortdesc lang="en">Zero-MQ usage</shortdesc>                                                                                                                                                                      
139
-<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />                                                                                                                                              
140
-</parameter>  
118
+<parameter name="database_server_port" unique="0" required="0">
119
+<longdesc lang="en">
120
+The listening port number of the database server. Use for monitoring purposes
121
+</longdesc>
122
+<shortdesc lang="en">Database listening port</shortdesc>
123
+<content type="integer" default="${OCF_RESKEY_database_server_port_default}" />
124
+</parameter>
125
+
126
+<parameter name="amqp_server_port" unique="0" required="0">
127
+<longdesc lang="en">
128
+The listening port number of the AMQP server. Use for monitoring purposes
129
+</longdesc>
130
+<shortdesc lang="en">AMQP listening port</shortdesc>
131
+<content type="integer" default="${OCF_RESKEY_amqp_server_port_default}" />
132
+</parameter>
133
+
134
+<parameter name="zeromq" unique="0" required="0">
135
+<longdesc lang="en">
136
+If zeromq is used, this will disable the connection test to the AMQP server. Use for monitoring purposes
137
+</longdesc>
138
+<shortdesc lang="en">Zero-MQ usage</shortdesc>
139
+<content type="boolean" default="${OCF_RESKEY_zeromq_default}" />
140
+</parameter>
141 141
 
142 142
 <parameter name="additional_parameters" unique="0" required="0">
143 143
 <longdesc lang="en">
@@ -172,7 +172,7 @@ nova_scheduler_check_port() {
172 172
 
173 173
     local int
174 174
     local cnt
175
-    
175
+
176 176
     int="$1"
177 177
     cnt=${#int}
178 178
     echo $int |egrep -qx '[0-9]+(:[0-9]+)?(,[0-9]+(:[0-9]+)?)*'
@@ -190,7 +190,7 @@ nova_scheduler_validate() {
190 190
     check_binary netstat
191 191
     nova_scheduler_check_port $OCF_RESKEY_database_server_port
192 192
     nova_scheduler_check_port $OCF_RESKEY_amqp_server_port
193
-    
193
+
194 194
     # A config file on shared storage that is not available
195 195
     # during probes is OK.
196 196
     if [ ! -f $OCF_RESKEY_config ]; then

Loading…
Cancel
Save