diff --git a/deployment/puppet/cluster/manifests/rabbitmq_ocf.pp b/deployment/puppet/cluster/manifests/rabbitmq_ocf.pp
index 808ceefe59..9784971e34 100644
--- a/deployment/puppet/cluster/manifests/rabbitmq_ocf.pp
+++ b/deployment/puppet/cluster/manifests/rabbitmq_ocf.pp
@@ -21,8 +21,10 @@
 #   Defaults to $::rabbitmq::port
 #
 # [*host_ip*]
-#   String. A string used for OCF script to collect
-#   RabbitMQ statistics
+#   String. An IP address that to be used as a part of the URL
+#   for importing rabbitmq definitions from a backup as a part of
+#   a recovery action.
+#
 #   Defaults to '127.0.0.1'
 #
 # [*debug*]
@@ -124,7 +126,7 @@ class cluster::rabbitmq_ocf (
   $mon_interval            = '30',
 ) inherits ::rabbitmq::service {
 
-  if $host_ip == 'UNSET' or $host_ip == '0.0.0.0' {
+  if $host_ip == '0.0.0.0' {
     $real_host_ip = '127.0.0.1'
   } else {
     $real_host_ip = $host_ip
diff --git a/deployment/puppet/osnailyfacter/manifests/rabbitmq/rabbitmq.pp b/deployment/puppet/osnailyfacter/manifests/rabbitmq/rabbitmq.pp
index ada9a4c70b..79d3376809 100644
--- a/deployment/puppet/osnailyfacter/manifests/rabbitmq/rabbitmq.pp
+++ b/deployment/puppet/osnailyfacter/manifests/rabbitmq/rabbitmq.pp
@@ -185,7 +185,19 @@ class osnailyfacter::rabbitmq::rabbitmq {
           erlang_cookie           => $erlang_cookie,
           admin_user              => $rabbit_hash['user'],
           admin_pass              => $rabbit_hash['password'],
-          host_ip                 => $rabbitmq_bind_ip_address,
+          # NOTE(binarin) This value is needed by (never-used) feature
+          # of dumping/resoring RabbitMQ definitions during
+          # recovery. Default value of '127.0.0.1' works very well,
+          # but when this value has node-specific values it can lead
+          # to random deploy failures. So in a very unlikely event the
+          # need to change this value arises the following things
+          # needs to be done:
+          # - support for private pacemaker attirbutes (attrd_update -p)
+          #   should be added to https://github.com/fuel-infra/puppet-pacemaker
+          # - '::cluster::rabbitmq_ocf' should start setting this attribute
+          #   via that new private attr functionality
+          # - HA OCF script should be updated accordingly in rabbitmq upstream
+          host_ip                 => $management_bind_ip_address,
           enable_rpc_ha           => $enable_rpc_ha,
           enable_notifications_ha => $enable_notifications_ha,
           fqdn_prefix             => $fqdn_prefix,
diff --git a/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb b/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb
index 7237b2c234..3d0a7b5f44 100644
--- a/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb
+++ b/tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb
@@ -160,7 +160,7 @@ describe manifest do
           :erlang_cookie           => erlang_cookie,
           :admin_user              => rabbit_hash['user'],
           :admin_pass              => rabbit_hash['password'],
-          :host_ip                 => rabbitmq_bind_ip_address,
+          :host_ip                 => management_bind_ip_address,
           :enable_rpc_ha           => enable_rpc_ha,
           :enable_notifications_ha => enable_notifications_ha,
           :fqdn_prefix             => fqdn_prefix,