[openstack-tripleo-image-elements] 0.6.5-6

[slagle]

commit 3555c2741d700ae606808c10067326c596b88fa5
Author: James Slagle <jslagle at redhat.com>
Date:   Tue Jul 1 14:12:51 2014 -0400

    0.6.5-6

 Move-rabbitmq-server-cluster-port.patch |   45 +++++++++++++++++++++++++++++++
 openstack-tripleo-image-elements.spec   |   12 +++++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/Move-rabbitmq-server-cluster-port.patch b/Move-rabbitmq-server-cluster-port.patch
new file mode 100644
index 0000000..79e4085
--- /dev/null
+++ b/Move-rabbitmq-server-cluster-port.patch
@@ -0,0 +1,45 @@
+From 89b520675f3a40f7a6396a79fd1105a3aaf9b8ec Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Tue, 1 Jul 2014 14:09:51 -0400
+Subject: [PATCH] Move rabbitmq-server cluster port
+
+This is a simplified version of the upstream patch
+https://review.openstack.org/#/c/91704/11
+
+This patch is much simpler for that one in that it
+doesn't also require the sysctl element to be backported.
+
+Change-Id: Ib58dd7d3ecfada47a5f4e7ef2745618ab718c35c
+---
+ .../rabbitmq-server/os-config-applier/etc/rabbitmq/rabbitmq.config    | 4 ++--
+ .../os-refresh-config/pre-configure.d/98-rabbitmq-iptables            | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/elements/rabbitmq-server/os-config-applier/etc/rabbitmq/rabbitmq.config b/elements/rabbitmq-server/os-config-applier/etc/rabbitmq/rabbitmq.config
+index 840569e..dc9121e 100644
+--- a/elements/rabbitmq-server/os-config-applier/etc/rabbitmq/rabbitmq.config
++++ b/elements/rabbitmq-server/os-config-applier/etc/rabbitmq/rabbitmq.config
+@@ -1,8 +1,8 @@
+ [
+   {kernel,
+     [
+-      {inet_dist_listen_min, 5535},
+-      {inet_dist_listen_max, 5535}
++      {inet_dist_listen_min, 61000},
++      {inet_dist_listen_max, 61000}
+     ]
+   }
+ ].
+diff --git a/elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables b/elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables
+index 4b52909..fca51fe 100755
+--- a/elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables
++++ b/elements/rabbitmq-server/os-refresh-config/pre-configure.d/98-rabbitmq-iptables
+@@ -1,4 +1,4 @@
+ #!/bin/bash
+ set -eu
+ 
+-add-rule INPUT -p tcp -m multiport --dports 4369,5535 -j ACCEPT
++add-rule INPUT -p tcp -m multiport --dports 4369,61000 -j ACCEPT
+-- 
+1.9.3
+
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index 523e22a..d196fad 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -4,7 +4,7 @@
 Name:		openstack-tripleo-image-elements
 Summary:	OpenStack TripleO Image Elements for diskimage-builder
 Version:	0.6.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
@@ -75,6 +75,12 @@ Patch0017:	Fix-rabbitmq-server-selinux-labeling.patch
 # https://review.openstack.org/#/c/102687/
 Patch0018:	Change-default-swift-ports.patch
 
+# https://review.openstack.org/#/c/91704
+# This patch is actually a simplified version of the above.
+# The upstream patch would require also backporting the
+# sysctl element, so we'll just change the port manually.
+Patch0019:	Move-rabbitmq-server-cluster-port.patch
+
 BuildArch:	noarch
 BuildRequires:	python
 BuildRequires:	python2-devel
@@ -110,6 +116,7 @@ program.
 %patch0016 -p1
 %patch0017 -p1
 %patch0018 -p1
+%patch0019 -p1
 
 %build
 %{__python} setup.py build
@@ -150,6 +157,9 @@ chmod +x %{buildroot}/%{_datarootdir}/tripleo-image-elements/rabbitmq-server/os-
 %{_datadir}/tripleo-image-elements
 
 %changelog
+* Tue Jun 30 2014 James Slagle <jslagle at redhat.com> - 0.6.5-6
+- Add patch Move-rabbitmq-server-cluster-port.patch
+
 * Thu Jun 26 2014 James Slagle <jslagle at redhat.com> - 0.6.5-5
 - Add 3 new SELinux patches