diff --git a/heartbeat/openstack-cinder-volume b/heartbeat/openstack-cinder-volume
index 19bf04faf..116442c41 100755
--- a/heartbeat/openstack-cinder-volume
+++ b/heartbeat/openstack-cinder-volume
@@ -1,291 +1,294 @@
 #!/bin/sh
 #
 #
 # OCF resource agent to attach a cinder volume to an instance.
 #
 # Copyright (c) 2018 Mathieu GRZYBEK
 # Based on code of Markus Guertler
 # All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
 
 #######################################################################
 # Initialization:
 
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 . ${OCF_FUNCTIONS_DIR}/openstack-common.sh
 
 # Defaults
 OCF_RESKEY_volume_local_check_default="true"
 
 : ${OCF_RESKEY_volume_local_check=${OCF_RESKEY_volume_local_check_default}}
 
 #######################################################################
 
 
 USAGE="usage: $0 {start|stop|status|meta-data}";
 ###############################################################################
 
 
 ###############################################################################
 #
 # Functions
 #
 ###############################################################################
 
 
 metadata() {
 cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="openstack-cinder-volume" version="2.0">
 <version>1.0</version>
 <longdesc lang="en">
 Resource Agent to attach a cinder volume to an instance.
 It relies on attributes given by openstack-info resource agent (openstack_id attribute).
 </longdesc>
 <shortdesc lang="en">Attach a cinder volume</shortdesc>
 
 <parameters>
 END
 
 common_meta_data
 
 cat <<END
 <parameter name="volume_local_check">
 <longdesc lang="en">
 This option allows the cluster to monitor the cinder volume presence without 
 calling the API.
 </longdesc>
 <shortdesc lang="en">Monitor cinder volume locally</shortdesc>
 <content type="boolean" default="${OCF_RESKEY_volume_local_check_default}" />
 </parameter>
 
 <parameter name="volume_id" required="1">
 <longdesc lang="en">
 Cinder volume identifier to use to attach the block storage.
 </longdesc>
 <shortdesc lang="en">Volume ID</shortdesc>
 <content type="string" />
 </parameter>
 </parameters>
 
 <actions>
 <action name="start" timeout="180s" />
 <action name="stop" timeout="180s" />
 <action name="monitor" depth="0" timeout="180s" interval="60s" />
 <action name="validate-all" timeout="5s" />
 <action name="meta-data" timeout="5s" />
 </actions>
 </resource-agent>
 END
 }
 
 _get_node_id() {
 	node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $(crm_node -n) |
 		awk -F= '{gsub("\"","");print $NF}')
 
 	if ! echo $node_id|grep -P "^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$"; then
 		ocf_exit_reason "openstack_id attribute must be set for node $crm_node"
 		exit $OCF_ERR_CONFIGURED
 	fi
 }
 
 osvol_validate() {
+	local result
+
 	check_binary "$OCF_RESKEY_openstackcli"
 	
 	get_config
 
-	if ! $OCF_RESKEY_openstackcli volume list|grep -q $OCF_RESKEY_volume_id ; then
+	result=$(run_openstackcli "volume list")
+	if ! echo "$result" | grep -q $OCF_RESKEY_volume_id; then
 		ocf_exit_reason "volume-id $OCF_RESKEY_volume_id not found"
 		return $OCF_ERR_CONFIGURED
 	fi
 
 	${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $(crm_node -n) > /dev/null 2>&1
 	if [ $? -ne 0 ] ; then
 		ocf_log warn "attr_updater failed to get openstack_id attribute of node $OCF_RESOURCE_INSTANCE"
 		return $OCF_ERR_GENERIC
 	fi
 
 	return $OCF_SUCCESS
 }
 
 osvol_monitor() {
 	local result
 	local node_id
 	local short_volume_id
 
 	node_id=$(_get_node_id)
 
 	if [ "$__OCF_ACTION" = "monitor" ] && ocf_is_true $OCF_RESKEY_volume_local_check ; then
 		#
 		# Is the volue attached?
 		# We check the local devices
 		#
 		short_volume_id=$(echo $OCF_RESKEY_volume_id | awk '{print substr($0, 0, 20)}')
 		if lsblk /dev/disk/by-id/virtio-$short_volume_id 1>/dev/null 2>&1; then
 			return $OCF_SUCCESS
 		else
 			ocf_log warn "$OCF_RESKEY_volume_id is not attached to instance $node_id"
 			return $OCF_NOT_RUNNING
 		fi
 	fi
 
 	#
 	# Is the volue attached?
 	# We use the API
 	#
-	result=$($OCF_RESKEY_openstackcli volume show \
+	result=$(run_openstackcli "volume show \
 		--column status \
 		--column attachments \
 		--format value \
-		$OCF_RESKEY_volume_id)
+		$OCF_RESKEY_volume_id")
 
-	if echo "$result" | grep -q available ; then
+	if echo "$result" | grep -q available; then
 		ocf_log warn "$OCF_RESKEY_volume_id is not attached to any instance"
 		return $OCF_NOT_RUNNING
 	else
-		export attached_server_id=$(echo $result|head -n1|
+		export attached_server_id=$(echo "$result"|head -n1|
 			grep -P -o "'server_id': '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}'"|
 			grep -P -o "[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}")
 		ocf_log info "$OCF_RESKEY_volume_id is attached to instance $attached_server_id"
 
 		# Compare node_id and the id of the node the volume is attached to
 
 		if [ "$node_id" != "$attached_server_id" ] ; then
 			ocf_log warn "$OCF_RESKEY_volume_id is not attached to this instance"
 			return $OCF_NOT_RUNNING
 		fi
 	fi
 
 	return $OCF_SUCCESS
 }
 
 osvol_stop() {
 	local node_id
 
 	#
 	# Is the volume already attached?
 	#
 	osvol_monitor
 	if [ $? = $OCF_NOT_RUNNING ]; then
 		ocf_log info "Volume $OCF_RESKEY_volume_id already available"
 		return $OCF_SUCCESS
 	fi
 
 	node_id=$(_get_node_id)
 
 	#
 	# Detach the volume
 	#
-	if ! $OCF_RESKEY_openstackcli server remove volume $node_id $OCF_RESKEY_volume_id ; then
+	if ! run_openstackcli "server remove volume $node_id $OCF_RESKEY_volume_id"; then
 		ocf_log error "Couldn't remove volume $OCF_RESKEY_volume_id from instance $node_id"
 		return $OCF_ERR_GENERIC
 	fi
 
 	ocf_log info "Successfully removed $OCF_RESKEY_volume_id from instance $node_id"
 	return $OCF_SUCCESS
 }
 
 osvol_start() {
 	local node_id
 
 	#
 	# Is the volume already attached?
 	#
 	osvol_monitor
 	if [ $? = $OCF_SUCCESS ]; then
 		ocf_log info "$OCF_RESKEY_volume_id already attached"
 		return $OCF_SUCCESS
 	fi
 
 	#
 	# Detach it from another node
 	# TODO: make it optional in case multi-attachment is allowed by Cinder
 	#
 	if [ ! -z $attached_server_id ] ; then
-		if ! $OCF_RESKEY_openstackcli server remove volume $attached_server_id $OCF_RESKEY_volume_id ; then
+		if ! run_openstackcli "server remove volume $attached_server_id $OCF_RESKEY_volume_id"; then
 			ocf_log error "Couldn't remove volume $OCF_RESKEY_volume_id from instance $attached_server_id"
 			return $OCF_ERR_GENERIC
 		fi
 	fi
 
 	export attached_server_id=""
 	
 	node_id=$(_get_node_id)
 
 	#
 	# Attach the volume
 	#
-	$OCF_RESKEY_openstackcli server add volume $node_id $OCF_RESKEY_volume_id
+	run_openstackcli "server add volume $node_id $OCF_RESKEY_volume_id"
 	if [ $? != $OCF_SUCCESS ]; then
 		ocf_log error "Couldn't add volume $OCF_RESKEY_volume_id to instance $node_id"
 		return $OCF_ERR_GENERIC
 	fi
 
 	return $OCF_SUCCESS
 }
 
 ###############################################################################
 #
 # MAIN
 #
 ###############################################################################
 
 case $__OCF_ACTION in
 	meta-data)
 		metadata
 		exit $OCF_SUCCESS
 		;;
 	usage|help)
 		echo $USAGE
 		exit $OCF_SUCCESS
 		;;
 esac
 
 if ! ocf_is_root; then
 	ocf_log err "You must be root for $__OCF_ACTION operation."
 	exit $OCF_ERR_PERM
 fi
 
 case $__OCF_ACTION in
 	start)
 		osvol_validate || exit $?
 		osvol_start;;
 	stop)
 		osvol_validate || exit $?
 		osvol_stop;;
 	monitor|status)
 		osvol_validate || exit $?
 		osvol_monitor;;
 	validate-all)
 		osvol_validate
 		;;
 	*)
 		echo $USAGE
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 
 exit $?
diff --git a/heartbeat/openstack-common.sh b/heartbeat/openstack-common.sh
index 4763c90db..b6eec09c2 100644
--- a/heartbeat/openstack-common.sh
+++ b/heartbeat/openstack-common.sh
@@ -1,147 +1,169 @@
 OCF_RESKEY_openstackcli_default="/usr/bin/openstack"
 OCF_RESKEY_insecure_default="false"
 
 : ${OCF_RESKEY_openstackcli=${OCF_RESKEY_openstackcli_default}}
 : ${OCF_RESKEY_insecure=${OCF_RESKEY_insecure_default}}
 
 if ocf_is_true "${OCF_RESKEY_insecure}"; then
 	OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --insecure"
 fi
 
 common_meta_data() {
 	cat <<END
 
 <parameter name="cloud" required="0">
 <longdesc lang="en">
 Openstack cloud (from ~/.config/openstack/clouds.yaml or /etc/openstack/clouds.yaml).
 </longdesc>
 <shortdesc lang="en">Cloud from clouds.yaml</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="openrc" required="0">
 <longdesc lang="en">
 Openstack credentials as openrc file from api_access/openrc.
 </longdesc>
 <shortdesc lang="en">openrc file</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="auth_url" required="0">
 <longdesc lang="en">
 Keystone Auth URL
 </longdesc>
 <shortdesc lang="en">Keystone Auth URL</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="username" required="0">
 <longdesc lang="en">
 Username.
 </longdesc>
 <shortdesc lang="en">Username</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="password" required="0">
 <longdesc lang="en">
 Password.
 </longdesc>
 <shortdesc lang="en">Password</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="project_name" required="0">
 <longdesc lang="en">
 Keystone Project.
 </longdesc>
 <shortdesc lang="en">Keystone Project</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="user_domain_name" required="0">
 <longdesc lang="en">
 Keystone User Domain Name.
 </longdesc>
 <shortdesc lang="en">Keystone User Domain Name</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="project_domain_name" required="0">
 <longdesc lang="en">
 Keystone Project Domain Name.
 </longdesc>
 <shortdesc lang="en">Keystone Project Domain Name</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="openstackcli">
 <longdesc lang="en">
 Path to command line tools for openstack.
 </longdesc>
 <shortdesc lang="en">Path to Openstack CLI tool</shortdesc>
 <content type="string" default="${OCF_RESKEY_openstackcli_default}" />
 </parameter>
 
 <parameter name="insecure">
 <longdesc lang="en">
 Allow insecure connections
 </longdesc>
 <shortdesc lang="en">Allow insecure connections</shortdesc>
 <content type="boolean" default="${OCF_RESKEY_insecure_default}" />
 </parameter>
 END
 }
 
 get_config() {
 	if [ -n "$OCF_RESKEY_cloud" ]; then
 		TILDE=$(echo ~)
 		clouds_yaml="$TILDE/.config/openstack/clouds.yaml"
 		if [ ! -f "$clouds_yaml" ]; then
 			clouds_yaml="/etc/openstack/clouds.yaml"
 		fi
 		if [ ! -f "$clouds_yaml" ]; then
 			ocf_exit_reason "~/.config/openstack/clouds.yaml and /etc/openstack/clouds.yaml does not exist"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --os-cloud $OCF_RESKEY_cloud"
 	elif [ -n "$OCF_RESKEY_openrc" ]; then
 		if [ ! -f "$OCF_RESKEY_openrc" ]; then
 			ocf_exit_reason "$OCF_RESKEY_openrc does not exist"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		. $OCF_RESKEY_openrc
 	else
 		if [ -z "$OCF_RESKEY_auth_url" ]; then
 			ocf_exit_reason "auth_url not set"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		if [ -z "$OCF_RESKEY_username" ]; then
 			ocf_exit_reason "username not set"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		if [ -z "$OCF_RESKEY_password" ]; then
 			ocf_exit_reason "password not set"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		if [ -z "$OCF_RESKEY_project_name" ]; then
 			ocf_exit_reason "project_name not set"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		if [ -z "$OCF_RESKEY_user_domain_name" ]; then
 			ocf_exit_reason "user_domain_name not set"
 			exit $OCF_ERR_CONFIGURED
 		fi
 		if [ -z "$OCF_RESKEY_project_domain_name" ]; then
 			ocf_exit_reason " not set"
 			exit $OCF_ERR_CONFIGURED
 		fi
 
 		OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --os-auth-url $OCF_RESKEY_auth_url"
 		OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --os-username $OCF_RESKEY_username"
 		OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --os-password $OCF_RESKEY_password"
 		OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --os-project-name $OCF_RESKEY_project_name"
 		OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --os-user-domain-name $OCF_RESKEY_user_domain_name"
 		OCF_RESKEY_openstackcli="${OCF_RESKEY_openstackcli} --os-project-domain-name $OCF_RESKEY_project_domain_name"
 	fi
 }
+
+run_openstackcli() {
+	local cmd="${OCF_RESKEY_openstackcli} $1"
+	local result
+	local rc
+	local start_time=$(date +%s)
+	local end_time
+	local elapsed_time
+
+	result=$($cmd)
+	rc=$?
+	end_time=$(date +%s)
+	elapsed_time=$(expr $end_time - $start_time)
+
+	if [ $elapsed_time -gt 20 ]; then
+		ocf_log warn "$cmd took ${elapsed_time}s to complete"
+	fi
+
+	echo "$result"
+
+	return $rc
+}
diff --git a/heartbeat/openstack-floating-ip b/heartbeat/openstack-floating-ip
index 6e2895654..7317f19a8 100755
--- a/heartbeat/openstack-floating-ip
+++ b/heartbeat/openstack-floating-ip
@@ -1,254 +1,257 @@
 #!/bin/sh
 #
 #
 # OCF resource agent to move a floating address in an Openstack tenant.
 #
 # Copyright (c) 2018 Mathieu GRZYBEK
 # Based on code of Markus Guertler
 # All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
 
 #######################################################################
 # Initialization:
 
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 . ${OCF_FUNCTIONS_DIR}/openstack-common.sh
 
 # Defaults
 
 #######################################################################
 
 
 USAGE="usage: $0 {start|stop|status|meta-data}";
 ###############################################################################
 
 
 ###############################################################################
 #
 # Functions
 #
 ###############################################################################
 
 
 metadata() {
 cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="openstack-floating-ip" version="2.0">
 <version>1.0</version>
 <longdesc lang="en">
 Resource Agent to move a floating IP address from an instance to another one.
 It relies on attributes given by openstack-info resource agent (openstack_ports, openstack_id attributes).
 The attribute called "openstack_floating_ip" is updated.
 </longdesc>
 <shortdesc lang="en">Move a floating IP</shortdesc>
 
 <parameters>
 END
 
 common_meta_data
 
 cat <<END
 <parameter name="ip_id" required="1">
 <longdesc lang="en">
 Floating IP Identifier.
 </longdesc>
 <shortdesc lang="en">IP ID</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="subnet_id" required="1">
 <longdesc lang="en">
 Subnet Identifier to use to attach the address.
 </longdesc>
 <shortdesc lang="en">Subnet ID</shortdesc>
 <content type="string" />
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start" timeout="180s" />
 <action name="stop" timeout="180s" />
 <action name="monitor" depth="0" timeout="180s" interval="60s" />
 <action name="validate-all" timeout="5s" />
 <action name="meta-data" timeout="5s" />
 </actions>
 </resource-agent>
 END
 }
 
 osflip_validate() {
+	local result
+
 	check_binary "$OCF_RESKEY_openstackcli"
 
 	get_config
 
-	if ! $OCF_RESKEY_openstackcli floating ip list|grep -q $OCF_RESKEY_ip_id ; then
+	result=$(run_openstackcli "floating ip list")
+	if ! echo "$result" | grep -q $OCF_RESKEY_ip_id; then
 		ocf_exit_reason "ip-id $OCF_RESKEY_ip_id not found"
 		return $OCF_ERR_CONFIGURED
 	fi
 
 	${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $(crm_node -n) > /dev/null 2>&1
 	if [ $? -ne 0 ] && ! ocf_is_probe; then
 		ocf_log warn "attr_updater failed to get openstack_ports attribute of node $OCF_RESOURCE_INSTANCE"
 		return $OCF_ERR_GENERIC
 	fi
 
 	return $OCF_SUCCESS
 }
 
 osflip_monitor() {
 	local result
 	local floating_ip
 	local node_port_ids
 	local port
 	local buffer
 
 	node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $(crm_node -n) \
 		| awk -F= '{gsub("\"","");print $NF}' \
 		| tr ',' ' ' \
 		| awk '{gsub("[^ ]*:", "");print}')
 
 	# Is the IP active and attached?
-	result=$($OCF_RESKEY_openstackcli floating ip show \
+	result=$(run_openstackcli "floating ip show \
 		--column port_id --column floating_ip_address \
 		--format yaml \
-		$OCF_RESKEY_ip_id)
+		$OCF_RESKEY_ip_id")
 
 	for port in $node_port_ids ; do
-		if echo $result | grep -q $port ; then
-			floating_ip=$(echo $result | awk '/floating_ip_address/ {print $2}')
+		if echo "$result" | grep -q $port ; then
+			floating_ip=$(echo "$result" | awk '/floating_ip_address/ {print $2}')
 			${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -S status -n openstack_floating_ip -v $floating_ip
 
 			return $OCF_SUCCESS
 		fi
 	done
 
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -S state -n openstack_floating_ip
 	ocf_log warn "$OCF_RESKEY_ip_id is not attached to any fixed address"
 	return $OCF_NOT_RUNNING
 }
 
 osflip_stop() {
 	ocf_log info "Bringing down IP address $OCF_RESKEY_ip_id"
 
 	osflip_monitor
 	if [ $? = $OCF_NOT_RUNNING ]; then
 		ocf_log info "Address $OCF_RESKEY_ip_id already down"
 		return $OCF_SUCCESS
 	fi
 
-	if ! $OCF_RESKEY_openstackcli floating ip unset --port $OCF_RESKEY_ip_id ; then
+	if ! run_openstackcli "floating ip unset --port $OCF_RESKEY_ip_id"; then
 		return $OCF_ERR_GENERIC
 	fi
 
 	osflip_monitor
 	if [ $? != $OCF_NOT_RUNNING ]; then
 		ocf_log error "Couldn't unset IP address $OCF_RESKEY_ip_id."
 		return $OCF_ERR_GENERIC
 	fi
 
 	ocf_log info "Successfully brought down $OCF_RESKEY_ip_id"
 	return $OCF_SUCCESS
 }
 
 osflip_start() {
 	local node_port_id
 	local node_port_ids
 
 	osflip_monitor
 	if [ $? = $OCF_SUCCESS ]; then
 		ocf_log info "$OCF_RESKEY_ip_id already started"
 		return $OCF_SUCCESS
 	fi
 
 	# Get port_id from subnet_id
 	node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $(crm_node -n) \
 		| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
 
 	node_port_id=$(echo $node_port_ids \
 		| tr ',' '\n' \
 		| awk -F: "/$OCF_RESKEY_subnet_id/ {print \$2}")
 
 	ocf_log info "Moving IP address $OCF_RESKEY_ip_id to port ID $node_port_id"
 
-	$OCF_RESKEY_openstackcli floating ip set --port $node_port_id $OCF_RESKEY_ip_id
+	run_openstackcli "floating ip set --port $node_port_id $OCF_RESKEY_ip_id"
 	if [ $? != $OCF_SUCCESS ]; then
 		ocf_log error "$OCF_RESKEY_ip_id Cannot be set to port $node_port_id"
 		return $OCF_ERR_GENERIC
 	fi
 
 	osflip_monitor
 	if [ $? != $OCF_SUCCESS ]; then
 		ocf_log error "$OCF_RESKEY_ip_id Cannot be set to port $node_port_id"
 		return $OCF_ERR_GENERIC
 	fi
 
 	ocf_log info "Successfully brought up $OCF_RESKEY_ip_id"
 	return $OCF_SUCCESS
 }
 
 ###############################################################################
 #
 # MAIN
 #
 ###############################################################################
 
 case $__OCF_ACTION in
 	meta-data)
 		metadata
 		exit $OCF_SUCCESS
 		;;
 	usage|help)
 		echo $USAGE
 		exit $OCF_SUCCESS
 		;;
 esac
 
 if ! ocf_is_root; then
 	ocf_log err "You must be root for $__OCF_ACTION operation."
 	exit $OCF_ERR_PERM
 fi
 
 case $__OCF_ACTION in
 	start)
 		osflip_validate || exit $?
 		osflip_start;;
 	stop)
 		osflip_validate || exit $?
 		osflip_stop;;
 	monitor)
 		osflip_validate || exit $?
 		osflip_monitor;;
 	validate-all)
 		osflip_validate
 		;;
 	*)
 		echo $USAGE
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 
 exit $?
diff --git a/heartbeat/openstack-info.in b/heartbeat/openstack-info.in
index f3a59fc7a..6502f1df1 100755
--- a/heartbeat/openstack-info.in
+++ b/heartbeat/openstack-info.in
@@ -1,270 +1,270 @@
 #!/bin/sh
 #
 #
 # OCF resource agent to set attributes from Openstack instance details.
 # It records (in the CIB) various attributes of a node
 #
 # Copyright (c) 2018 Mathieu Grzybek
 #          All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like. Any license provided herein, whether implied or
 # otherwise, applies only to this software file. Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 #######################################################################
 # Initialization:
 
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 . ${OCF_FUNCTIONS_DIR}/openstack-common.sh
 
 # Defaults
 OCF_RESKEY_pidfile_default="$HA_RSCTMP/OSInfo-${OCF_RESOURCE_HOSTNAME}"
 OCF_RESKEY_delay_default="0"
 OCF_RESKEY_clone_default="0"
 OCF_RESKEY_curlcli_default="/usr/bin/curl"
 OCF_RESKEY_pythoncli_default="@PYTHON@"
 
 : ${OCF_RESKEY_curlcli=${OCF_RESKEY_curlcli_default}}
 : ${OCF_RESKEY_pythoncli=${OCF_RESKEY_pythoncli_default}}
 : ${OCF_RESKEY_pidfile=${OCF_RESKEY_pidfile_default}}
 : ${OCF_RESKEY_delay=${OCF_RESKEY_delay_default}}
 : ${OCF_RESKEY_clone=${OCF_RESKEY_clone_default}}
 
 #######################################################################
 
 meta_data() {
 	cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="openstack-info" version="1.0">
 <version>1.0</version>
 
 <longdesc lang="en">
 OCF resource agent to set attributes from Openstack instance details.
 It records (in the CIB) various attributes of a node.
 Sample output:
 	openstack_az      : nova
 	openstack_flavor  : c1.small
 	openstack_id      : 60ac4343-5828-49b1-8aac-7c69b1417f31
 	openstack_ports   : 7960d889-9750-4160-bf41-c69a41ad72d9:96530d18-57a3-4718-af32-30f2a74c22a2,b0e55a06-bd75-468d-8baa-22cfeb65799f:a55ae917-8016-4b1e-8ffa-04311b9dc7d6
 
 The layout of openstack_ports is a comma-separated list of tuples "subnet_id:port_id".
 </longdesc>
 <shortdesc lang="en">Records various node attributes in the CIB</shortdesc>
 
 <parameters>
 END
 
 common_meta_data
 
 	cat <<END
 <parameter name="pidfile" unique="0">
 <longdesc lang="en">PID file</longdesc>
 <shortdesc lang="en">PID file</shortdesc>
 <content type="string" default="${OCF_RESKEY_pidfile_default}" />
 </parameter>
 
 <parameter name="delay" unique="0">
 <longdesc lang="en">Interval to allow values to stabilize</longdesc>
 <shortdesc lang="en">Dampening Delay</shortdesc>
 <content type="string" default="${OCF_RESKEY_delay_default}" />
 </parameter>
 
 <parameter name="curlcli">
 <longdesc lang="en">
 Path to command line cURL binary.
 </longdesc>
 <shortdesc lang="en">Path to cURL binary</shortdesc>
 <content type="string" default="${OCF_RESKEY_curlcli_default}" />
 </parameter>
 
 <parameter name="pythoncli">
 <longdesc lang="en">
 Path to command line Python interpreter.
 </longdesc>
 <shortdesc lang="en">Path to Python interpreter</shortdesc>
 <content type="string" default="${OCF_RESKEY_pythoncli_default}" />
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start"  timeout="180s" />
 <action name="stop" timeout="180s" />
 <action name="monitor" timeout="180s" interval="60s"/>
 <action name="meta-data" timeout="5s" />
 <action name="validate-all" timeout="20s" />
 </actions>
 </resource-agent>
 END
 }
 
 #######################################################################
 
 OSInfoStats() {
-	local result
 	local value
-	local node
 	local node_id
 
 	get_config
 
 	# Nova data: server ID
 	node_id=$($OCF_RESKEY_curlcli \
 		-s http://169.254.169.254/openstack/latest/meta_data.json |
 		$OCF_RESKEY_pythoncli -m json.tool |
 		grep -P '\"uuid\": \".*\",$' |
 		grep -P -o '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}')
 
 	if [ $? -ne 0 ] ; then
 		ocf_exit_reason "Cannot find server ID"
 		exit $OCF_ERR_GENERIC
 	fi
 
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_id -v "$node_id"
 
 	# Nova data: flavor
-	value=$($OCF_RESKEY_openstackcli server show \
+	value=$(run_openstackcli "server show \
 		--format value \
 		--column flavor \
-		$node_id)
+		$node_id")
 
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_flavor -v "$value"
 
 	# Nova data: availability zone
-	value=$($OCF_RESKEY_openstackcli server show \
+	value=$(run_openstackcli "server show \
 		--format value \
 		--column OS-EXT-AZ:availability_zone \
-		$node_id)
+		$node_id")
 
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_az -v "$value"
 
 	# Network data: ports
 	value=""
-	for port_id in $($OCF_RESKEY_openstackcli port list \
+	for port_id in $(run_openstackcli "port list \
 		--format value \
 		--column id \
-		--server $node_id); do
-		subnet_id=$($OCF_RESKEY_openstackcli port show \
+		--server $node_id"); do
+		subnet_result=$(run_openstackcli "port show \
 			--format json \
 			--column fixed_ips \
-			${port_id} | grep -P '\"subnet_id\": \".*\",$' |
+			${port_id}")
+		subnet_id=$(echo "$subnet_result" |
+			grep -P '\"subnet_id\": \".*\",$' |
 			grep -P -o '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}')
 		value="${value}${subnet_id}:${port_id},"
 	done
 	value=${value%,}
 
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_ports -v "$value"
 
 	if [ ! -z "$OS_REGION_NAME" ] ; then
 		${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_region -v "$OS_REGION_NAME"
 	fi
 
 	if [ ! -z "$OS_TENANT_ID" ] ; then
 		${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_tenant_id -v "$OS_TENANT_ID"
 
 		if [ ! -z "$OS_TENANT_NAME" ] ; then
 			${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_tenant_name -v "$OS_TENANT_NAME"
 		fi
 	else
 		${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_project_id -v "$OS_PROJECT_ID"
 
 		if [ ! -z "$OS_PROJECT_NAME" ] ; then
 			${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -n openstack_project_name -v "$OS_PROJECT_NAME"
 		fi
 	fi
 
 }
 
 OSInfo_usage() {
 	cat <<END
 usage: $0 {start|stop|monitor|validate-all|meta-data}
 
 Expects to have a fully populated OCF RA-compliant environment set.
 END
 }
 
 OSInfo_start() {
 	echo $OCF_RESKEY_clone > $OCF_RESKEY_pidfile
 	OSInfoStats
 	exit $OCF_SUCCESS
 }
 
 OSInfo_stop() {
 	rm -f $OCF_RESKEY_pidfile
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_id
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_flavor
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_az
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_ports
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_region
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_tenant_id
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_tenant_name
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_project_id
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -n openstack_project_name
 	exit $OCF_SUCCESS
 }
 
 OSInfo_monitor() {
 	if [ -f "$OCF_RESKEY_pidfile" ] ; then
 		OSInfoStats
 		exit $OCF_RUNNING
 	fi
 	exit $OCF_NOT_RUNNING
 }
 
 OSInfo_validate() {
 	check_binary "$OCF_RESKEY_curlcli"
 	check_binary "$OCF_RESKEY_openstackcli"
 	check_binary "$OCF_RESKEY_pythoncli"
 
 	return $OCF_SUCCESS
 }
 
 if [ $# -ne 1 ]; then
 	OSInfo_usage
 	exit $OCF_ERR_ARGS
 fi
 
 if [ x != x${OCF_RESKEY_delay} ]; then
 	OCF_RESKEY_delay="-d ${OCF_RESKEY_delay}"
 fi
 
 case $__OCF_ACTION in
 meta-data)	meta_data
 		exit $OCF_SUCCESS
 		;;
 start)		OSInfo_validate || exit $?
 		OSInfo_start
 		;;
 stop)		OSInfo_stop
 		;;
 monitor)	OSInfo_monitor
 		;;
 validate-all)	OSInfo_validate
 		;;
 usage|help)	OSInfo_usage
 		exit $OCF_SUCCESS
 		;;
 *)		OSInfo_usage
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 
 exit $?
diff --git a/heartbeat/openstack-virtual-ip b/heartbeat/openstack-virtual-ip
index c654d980a..361357d55 100755
--- a/heartbeat/openstack-virtual-ip
+++ b/heartbeat/openstack-virtual-ip
@@ -1,258 +1,258 @@
 #!/bin/sh
 #
 #
 # OCF resource agent to move a virtual address in an Openstack tenant.
 #
 # Copyright (c) 2018 Mathieu GRZYBEK
 # Based on code of Markus Guertler
 # All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
 # published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it would be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Further, this software is distributed without any warranty that it is
 # free of the rightful claim of any third person regarding infringement
 # or the like.  Any license provided herein, whether implied or
 # otherwise, applies only to this software file.  Patent licenses, if
 # any, provided herein do not apply to combinations of this program with
 # other software, or any other product whatsoever.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
 
 #######################################################################
 # Initialization:
 
 : ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
 . ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
 
 . ${OCF_FUNCTIONS_DIR}/openstack-common.sh
 
 # Defaults
 
 #######################################################################
 
 
 USAGE="usage: $0 {start|stop|status|meta-data}";
 ###############################################################################
 
 
 ###############################################################################
 #
 # Functions
 #
 ###############################################################################
 
 
 metadata() {
 cat <<END
 <?xml version="1.0"?>
 <!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
 <resource-agent name="openstack-virtual-ip" version="2.0">
 <version>1.0</version>
 <longdesc lang="en">
 Resource Agent to move a virtual IP address from an instance to another one
 by adding an allowed-address pair associated with an instance port.
 It relies on attributes given by openstack-info resource agent (openstack_ports, openstack_id attributes).
 The attribute called "openstack_virtual_ip" is updated.
 </longdesc>
 <shortdesc lang="en">Move a virtual IP</shortdesc>
 
 <parameters>
 END
 
 common_meta_data
 
 cat <<END
 <parameter name="ip" required="1">
 <longdesc lang="en">
 Virtual IP Address.
 </longdesc>
 <shortdesc lang="en">IP Address</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="subnet_id" required="1">
 <longdesc lang="en">
 Subnet Identifier to use to attach the address.
 </longdesc>
 <shortdesc lang="en">Subnet ID</shortdesc>
 <content type="string" />
 </parameter>
 
 </parameters>
 
 <actions>
 <action name="start" timeout="180s" />
 <action name="stop" timeout="180s" />
 <action name="monitor" depth="0" timeout="180s" interval="60s" />
 <action name="validate-all" timeout="5s" />
 <action name="meta-data" timeout="5s" />
 </actions>
 </resource-agent>
 END
 }
 
 osvip_port_id() {
 	# Get port_id from subnet_id
 	node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $(crm_node -n) \
 		| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
 
 	node_port_id=$(echo $node_port_ids \
 		| tr ',' '\n' \
 		| awk -F: "/$OCF_RESKEY_subnet_id/ {print \$2}")
 
 	echo ${node_port_id}
 }
 
 osvip_validate() {
 	check_binary "$OCF_RESKEY_openstackcli"
 
 	get_config
 
 	${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $(crm_node -n) > /dev/null 2>&1
 	if [ $? -ne 0 ] && ! ocf_is_probe; then
 		ocf_log warn "attr_updater failed to get openstack_ports attribute of node $OCF_RESOURCE_INSTANCE"
 		return $OCF_ERR_GENERIC
 	fi
 
 	return $OCF_SUCCESS
 }
 
 osvip_monitor() {
 	local result
 
 	node_port_id=$(osvip_port_id)
 
-	result=$($OCF_RESKEY_openstackcli port show \
+	result=$(run_openstackcli "port show \
 		--format value \
 		--column allowed_address_pairs \
-		${node_port_id})
-	if echo $result | grep -q "$OCF_RESKEY_ip"; then
+		${node_port_id}")
+	if echo "$result" | grep -q "$OCF_RESKEY_ip"; then
 		${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -S status -n openstack_virtual_ip -v $OCF_RESKEY_ip
 
 		return $OCF_SUCCESS
 	fi
 
 	${HA_SBIN_DIR}/attrd_updater ${OCF_RESKEY_delay} -D -S state -n openstack_virtual_ip
 	ocf_log warn "$OCF_RESKEY_ip is not attached to any fixed address"
 	return $OCF_NOT_RUNNING
 }
 
 osvip_stop() {
 	node_port_id=$(osvip_port_id)
 
 	ocf_log info "Bringing down IP address $OCF_RESKEY_ip"
 
 	osvip_monitor
 	if [ $? = $OCF_NOT_RUNNING ]; then
 		ocf_log info "Address $OCF_RESKEY_ip already down"
 		return $OCF_SUCCESS
 	fi
 
-	mac_address=$($OCF_RESKEY_openstackcli port show \
+	mac_address=$(run_openstackcli "port show \
 		--format value \
 		--column mac_address \
-		$node_port_id)
-	echo ${mac_address} | grep -q -P "^([0-9a-f]{2}:){5}[0-9a-f]{2}$"
+		$node_port_id")
+	echo "${mac_address}" | grep -q -P "^([0-9a-f]{2}:){5}[0-9a-f]{2}$"
 	if [ $? -ne 0 ]; then
 		ocf_log error "MAC address '${mac_address}' is not valid."
 		return $OCF_ERR_GENERIC
 	fi
 
-	if ! $OCF_RESKEY_openstackcli port unset \
+	if ! run_openstackcli "port unset \
 		--allowed-address \
 		ip-address=$OCF_RESKEY_ip,mac-address=${mac_address} \
-		$node_port_id; then
+		$node_port_id"; then
 		return $OCF_ERR_GENERIC
 	fi
 
 	osvip_monitor
 	if [ $? != $OCF_NOT_RUNNING ]; then
 		ocf_log error "Couldn't unset IP address $OCF_RESKEY_ip."
 		return $OCF_ERR_GENERIC
 	fi
 
 	ocf_log info "Successfully brought down $OCF_RESKEY_ip"
 	return $OCF_SUCCESS
 }
 
 osvip_start() {
 	node_port_id=$(osvip_port_id)
 
 	osvip_monitor
 	if [ $? = $OCF_SUCCESS ]; then
 		ocf_log info "$OCF_RESKEY_ip already started"
 		return $OCF_SUCCESS
 	fi
 
 	ocf_log info "Moving IP address $OCF_RESKEY_ip to port ID $node_port_id"
 
-	$OCF_RESKEY_openstackcli port set \
+	run_openstackcli "port set \
 		--allowed-address ip-address=$OCF_RESKEY_ip \
-		$node_port_id
+		$node_port_id"
 	if [ $? != $OCF_SUCCESS ]; then
 		ocf_log error "$OCF_RESKEY_ip Cannot be set to port $node_port_id"
 		return $OCF_ERR_GENERIC
 	fi
 
 	osvip_monitor
 	if [ $? != $OCF_SUCCESS ]; then
 		ocf_log error "$OCF_RESKEY_ip Cannot be set to port $node_port_id"
 		return $OCF_ERR_GENERIC
 	fi
 
 	ocf_log info "Successfully brought up $OCF_RESKEY_ip"
 	return $OCF_SUCCESS
 }
 
 ###############################################################################
 #
 # MAIN
 #
 ###############################################################################
 
 case $__OCF_ACTION in
 	meta-data)
 		metadata
 		exit $OCF_SUCCESS
 		;;
 	usage|help)
 		echo $USAGE
 		exit $OCF_SUCCESS
 		;;
 esac
 
 if ! ocf_is_root; then
 	ocf_log err "You must be root for $__OCF_ACTION operation."
 	exit $OCF_ERR_PERM
 fi
 
 case $__OCF_ACTION in
 	start)
 		osvip_validate || exit $?
 		osvip_start;;
 	stop)
 		osvip_validate || exit $?
 		osvip_stop;;
 	monitor)
 		osvip_validate || exit $?
 		osvip_monitor;;
 	validate-all)
 		osvip_validate
 		;;
 	*)
 		echo $USAGE
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
 
 exit $?