diff --git a/heartbeat/openstack-cinder-volume b/heartbeat/openstack-cinder-volume
index b960646ff..c0a132545 100755
--- a/heartbeat/openstack-cinder-volume
+++ b/heartbeat/openstack-cinder-volume
@@ -1,232 +1,235 @@
 #!/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
 
 # Defaults
 OCF_RESKEY_openstackcli_default="/usr/bin/openstack"
 
 : ${OCF_RESKEY_openstackcli=${OCF_RESKEY_openstackcli_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>
 <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>
 <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="openrc" required="1">
 <longdesc lang="en">
 Valid Openstack credentials as openrc file from api_access/openrc.
 </longdesc>
 <shortdesc lang="en">openrc file</shortdesc>
 <content type="string" />
 </parameter>
 
 <parameter name="volume_id" required="1">
 <longdesc lang="en">
 Cinder volume identifier to use to attach the bloc 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="30s" interval="60s" />
 <action name="validate-all" timeout="5s" />
 <action name="meta-data" timeout="5s" />
 </actions>
 </resource-agent>
 END
 }
 
 osvol_validate() {
 	check_binary "$OCF_RESKEY_openstackcli"
 
 	if [ -z "$OCF_RESKEY_openrc" ]; then
 		ocf_exit_reason "openrc parameter not set"
 		return $OCF_ERR_CONFIGURED
 	fi
 
 	if [ ! -f "$OCF_RESKEY_openrc" ] ; then
 		ocf_exit_reason "openrc file not found"
 		return $OCF_ERR_CONFIGURED
 	fi
 
 	. $OCF_RESKEY_openrc
 
 	if ! $OCF_RESKEY_openstackcli volume list|grep -q $OCF_RESKEY_volume_id ; then
 		ocf_exit_reason "Volume $OCF_RESKEY_volume_id not found"
 		return $OCF_ERR_CONFIGURED
 	fi
 
 	return $OCF_SUCCESS
 }
 
 osvol_monitor() {
 	local result
 	local attached_server_id
 	local node_id
 
 	# Is the volue attached?
 	result=$($OCF_RESKEY_openstackcli volume show \
 		--column status \
 		--column attachments \
 		--format value \
 		$OCF_RESKEY_volume_id)
 
 	if [[ "$result" =~ "available" ]] ; then
 		ocf_log warn "$OCF_RESKEY_volume_id is not attached to any instance"
 		return $OCF_NOT_RUNNING
 	else
 		attached_server_id=$(echo $result|head -n1|awk -F "'" '{print $4}')
 		ocf_log info "$OCF_RESKEY_volume_id is attached to instance $attached_server_id"
-		node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME|awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
+		node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME \
+			| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
 
 		if [ "$node_id" != "$attached_server_id" ] ; then
 			return $OCF_NOT_RUNNING
 		fi
 	fi
 
 	return $OCF_SUCCESS
 }
 
 osvol_stop() {
 	local node_id
 
 	osvol_monitor
 	if [ $? = $OCF_NOT_RUNNING ]; then
 		ocf_log info "Volume $OCF_RESKEY_volume_id already available"
 		return $OCF_SUCCESS
 	fi
 
-	node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME|awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
+	node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME \
+		| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
 	if ! $OCF_RESKEY_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
 
 	osvol_monitor
 	if [ $? = $OCF_SUCCESS ]; then
 		ocf_log info "$OCF_RESKEY_volume_id already attached"
 		return $OCF_SUCCESS
 	fi
 
-	node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME|awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
+	node_id=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_id -N $HOSTNAME \
+		| awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
 	$OCF_RESKEY_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
 
 osvol_validate
 
 case $__OCF_ACTION in
 	start)
 		osvol_start;;
 	stop)
 		osvol_stop;;
 	monitor|status)
 		osvol_monitor;;
 	validate-all)
 		exit $?;;
 	*)
 		echo $USAGE
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac
diff --git a/heartbeat/openstack-floating-ip b/heartbeat/openstack-floating-ip
index c97d318b2..944e27f51 100755
--- a/heartbeat/openstack-floating-ip
+++ b/heartbeat/openstack-floating-ip
@@ -1,263 +1,267 @@
 #!/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
 
 # Defaults
 OCF_RESKEY_openstackcli_default="/usr/bin/openstack"
 
 : ${OCF_RESKEY_openstackcli=${OCF_RESKEY_openstackcli_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-floating-ip">
 <version>2.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>
 <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="openrc" required="1">
 <longdesc lang="en">
 Valid Openstack credentials as openrc file from api_access/openrc.
 </longdesc>
 <shortdesc lang="en">openrc file</shortdesc>
 <content type="string" />
 </parameter>
 
 <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="30s" interval="60s" />
 <action name="validate-all" timeout="5s" />
 <action name="meta-data" timeout="5s" />
 </actions>
 </resource-agent>
 END
 }
 
 osflip_validate() {
 	check_binary "$OCF_RESKEY_openstackcli"
 
 	if [ -z "$OCF_RESKEY_openrc" ]; then
 		ocf_exit_reason "openrc parameter not set"
 		return $OCF_ERR_CONFIGURED
 	fi
 
 	if [ ! -f "$OCF_RESKEY_openrc" ] ; then
 		ocf_exit_reason "openrc file not found"
 		return $OCF_ERR_CONFIGURED
 	fi
 
 	. $OCF_RESKEY_openrc
 
 	if ! $OCF_RESKEY_openstackcli floating ip list|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 $HOSTNAME > /dev/null 2>&1
 	if [ $? -ne 0 ] ; 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 $HOSTNAME|awk -F= '{gsub("\"","");print $NF}'|tr ',' ' '|awk -F: '{print $NF}')
+	node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $HOSTNAME \
+		| awk -F= '{gsub("\"","");print $NF}' \
+		| tr ',' ' ' \
+		| awk -F: '{print $NF}')
 
 	# Is the IP active and attached?
 	result=$($OCF_RESKEY_openstackcli floating ip show \
 		--column port_id --column floating_ip_address \
 		--format yaml \
 		$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}')
 			${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
 		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 unset $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 $HOSTNAME|awk '{gsub("value=","") ; gsub("\"","") ; print $NF}')
+	node_port_ids=$(${HA_SBIN_DIR}/attrd_updater --query -n openstack_ports -N $HOSTNAME \
+		| 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
 	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
 
 	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
 
 osflip_validate
 
 case $__OCF_ACTION in
 	start)
 		osflip_start;;
 	stop)
 		osflip_stop;;
 	monitor)
 		osflip_monitor;;
 	validate-all)
 		exit $?;;
 	*)
 		echo $USAGE
 		exit $OCF_ERR_UNIMPLEMENTED
 		;;
 esac