Fix the set_rabbitmq_policy.sh usage

* Call it only if exists
* Address packaging:
  - for stable branch, use packaging/common/ to contain the
    set_rabbitmq_policy.sh and include it to the debian rules
    and rpm spec
  NOTE: for master branch landing please update as appropriate,
  as it should be using ./scripts source!

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>

4 files changed, 7 insertions, 2 deletions

diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index f8aa0b484c..9a2cb4fb6e 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -12,6 +12,7 @@ Source3: rabbitmq-server.logrotate
 Source4: rabbitmq-server.ocf
 Source5: README
 Source6: rabbitmq-server-ha.ocf
+Source7: set_rabbitmq_policy.sh
 URL: http://www.rabbitmq.com/
 BuildArch: noarch
 BuildRequires: erlang >= R13B-03, python-simplejson, xmlto, libxslt, gzip, sed, zip
@@ -33,6 +34,7 @@ scalable implementation of an AMQP broker.
 %define _rabbit_server_ocf %{_builddir}/`basename %{S:4}`
 %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
 %define _rabbit_server_ha_ocf %{_builddir}/`basename %{S:6}`
+%define _set_rabbitmq_policy_sh %{_builddir}/`basename %{S:7}`
 
 
 %define _maindir %{buildroot}%{_rabbit_erllibdir}
@@ -46,6 +48,7 @@ cp %{S:2} %{_rabbit_wrapper}
 cp %{S:4} %{_rabbit_server_ocf}
 cp %{S:5} %{_builddir}/rabbitmq-server-%{version}/README
 cp %{S:6} %{_rabbit_server_ha_ocf}
+cp %{S:7} %{_set_rabbitmq_policy_sh}
 make %{?_smp_mflags}
 
 %install
@@ -65,6 +68,7 @@ install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server
 install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins
 install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
 install -p -D -m 0755 %{_rabbit_server_ha_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
+install -p -D -m 0755 %{_set_rabbitmq_policy_sh} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/set_rabbitmq_policy.sh
 install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server
 
 mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
@@ -105,7 +109,7 @@ if [ $1 = 0 ]; then
   #Complete uninstall
   /sbin/service rabbitmq-server stop
   /sbin/chkconfig --del rabbitmq-server
-  
+
   # We do not remove /var/log and /var/lib directories
   # Leave rabbitmq user and group
 fi
diff --git a/packaging/common/rabbitmq-server-ha.ocf b/packaging/common/rabbitmq-server-ha.ocf
index 223e27f6f4..02f2a1780a 100755
--- a/packaging/common/rabbitmq-server-ha.ocf
+++ b/packaging/common/rabbitmq-server-ha.ocf
@@ -1733,7 +1733,7 @@ action_promote() {
                     fi
 
                     local set_policy_path="$(dirname $0)/set_rabbitmq_policy.sh"
-                    . $set_policy_path
+                    [ -f $set_policy_path ] && . $set_policy_path
 
                     # create timestamp file
                     ocf_log info "${LH} Updating start timestamp"
diff --git a/scripts/set_rabbitmq_policy.sh b/packaging/common/set_rabbitmq_policy.sh
index a88b0c417a..a88b0c417a 100755
--- a/scripts/set_rabbitmq_policy.sh
+++ b/packaging/common/set_rabbitmq_policy.sh
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 434172defc..1e73691760 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -19,6 +19,7 @@ install/rabbitmq-server::
 	done
 	sed -e 's|@RABBIT_LIB@|/usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)|g' <debian/postrm.in >debian/postrm
 	install -p -D -m 0755 debian/rabbitmq-server.ocf $(DEB_DESTDIR)usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server
+	install -p -D -m 0755 debian/set_rabbitmq_policy.sh $(DEB_DESTDIR)usr/lib/ocf/resource.d/rabbitmq/set_rabbitmq_policy.sh
 	install -p -D -m 0755 debian/rabbitmq-server-ha.ocf $(DEB_DESTDIR)usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
 	install -p -D -m 0644 debian/rabbitmq-server.default $(DEB_DESTDIR)etc/default/rabbitmq-server