[openstack-tripleo-image-elements] Merge pull request #1 from rwsu/swift-ports

[slagle]

commit 1512dd694b33776ffff9d138c81b3d6892db1f5f
Author: James Slagle <jslagle at redhat.com>
Date:   Tue Oct 7 16:41:59 2014 -0400

    Merge pull request #1 from rwsu/swift-ports
    
    Changelog:
    - Merge pull request #1 from rwsu/swift-ports
    - Associate default images to storage roles

 0002-Change-default-swift-bind_ports.patch         |   47 ++++++++++++++++++++
 ...h => 0003-Use-resource-registry-parameter.patch |    0
 ...the-storage-roles-in-Tuskar-if-they-exist.patch |    0
 ...Associate-default-images-to-storage-roles.patch |    0
 openstack-tripleo-image-elements.spec              |   14 ++++--
 5 files changed, 57 insertions(+), 4 deletions(-)
---
diff --git a/0002-Change-default-swift-bind_ports.patch b/0002-Change-default-swift-bind_ports.patch
new file mode 100644
index 0000000..59e401e
--- /dev/null
+++ b/0002-Change-default-swift-bind_ports.patch
@@ -0,0 +1,47 @@
+From d540b460083251231465fee4a158e6848767b33f Mon Sep 17 00:00:00 2001
+From: Richard Su <rwsu at redhat.com>
+Date: Mon, 6 Oct 2014 22:36:20 -0700
+Subject: [PATCH] Change default swift bind_ports
+
+Change the default bind_ports to match the RDO package defaults
+where object-server is on 6200, container-server is on 6201, and
+account-server is on 6202.
+---
+ elements/swift-storage/os-apply-config/etc/swift/account-server.conf   | 2 +-
+ elements/swift-storage/os-apply-config/etc/swift/container-server.conf | 2 +-
+ elements/swift-storage/os-apply-config/etc/swift/object-server.conf    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/elements/swift-storage/os-apply-config/etc/swift/account-server.conf b/elements/swift-storage/os-apply-config/etc/swift/account-server.conf
+index da6c58f..6903c26 100644
+--- a/elements/swift-storage/os-apply-config/etc/swift/account-server.conf
++++ b/elements/swift-storage/os-apply-config/etc/swift/account-server.conf
+@@ -1,5 +1,5 @@
+ [DEFAULT]
+-bind_port = 6002
++bind_port = 6202
+ # Once we have partitions dedicated to swift storage this should be removed
+ mount_check = false
+ devices = /mnt/state/srv/node
+diff --git a/elements/swift-storage/os-apply-config/etc/swift/container-server.conf b/elements/swift-storage/os-apply-config/etc/swift/container-server.conf
+index 02113c8..5ba41ec 100644
+--- a/elements/swift-storage/os-apply-config/etc/swift/container-server.conf
++++ b/elements/swift-storage/os-apply-config/etc/swift/container-server.conf
+@@ -1,5 +1,5 @@
+ [DEFAULT]
+-bind_port = 6001
++bind_port = 6201
+ # Once we have partitions dedicated to swift storage this should be removed
+ mount_check = false
+ devices = /mnt/state/srv/node
+diff --git a/elements/swift-storage/os-apply-config/etc/swift/object-server.conf b/elements/swift-storage/os-apply-config/etc/swift/object-server.conf
+index 8536c90..a74ec97 100644
+--- a/elements/swift-storage/os-apply-config/etc/swift/object-server.conf
++++ b/elements/swift-storage/os-apply-config/etc/swift/object-server.conf
+@@ -1,5 +1,5 @@
+ [DEFAULT]
+-bind_port = 6000
++bind_port = 6200
+ # Once we have partitions dedicated to swift storage this should be removed
+ mount_check = false
+ devices = /mnt/state/srv/node
diff --git a/0002-Use-resource-registry-parameter.patch b/0003-Use-resource-registry-parameter.patch
similarity index 100%
rename from 0002-Use-resource-registry-parameter.patch
rename to 0003-Use-resource-registry-parameter.patch
diff --git a/0003-Load-the-storage-roles-in-Tuskar-if-they-exist.patch b/0004-Load-the-storage-roles-in-Tuskar-if-they-exist.patch
similarity index 100%
rename from 0003-Load-the-storage-roles-in-Tuskar-if-they-exist.patch
rename to 0004-Load-the-storage-roles-in-Tuskar-if-they-exist.patch
diff --git a/0004-Associate-default-images-to-storage-roles.patch b/0005-Associate-default-images-to-storage-roles.patch
similarity index 100%
rename from 0004-Associate-default-images-to-storage-roles.patch
rename to 0005-Associate-default-images-to-storage-roles.patch
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index 197a1d7..1c61351 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -4,16 +4,17 @@
 Name:		openstack-tripleo-image-elements
 Summary:	OpenStack TripleO Image Elements for diskimage-builder
 Version:	0.8.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
 Source0:	http://tarballs.openstack.org/tripleo-image-elements/tripleo-image-elements-%{version}.tar.gz
 
 Patch0001: 0001-Cinder-conf-patch.patch
-Patch0002: 0002-Use-resource-registry-parameter.patch
-Patch0003: 0003-Load-the-storage-roles-in-Tuskar-if-they-exist.patch
-Patch0004: 0004-Associate-default-images-to-storage-roles.patch
+Patch0002: 0002-Change-default-swift-bind_ports.patch
+Patch0003: 0003-Use-resource-registry-parameter.patch
+Patch0004: 0004-Load-the-storage-roles-in-Tuskar-if-they-exist.patch
+Patch0005: 0005-Associate-default-images-to-storage-roles.patch
 
 BuildArch:	noarch
 BuildRequires:	python
@@ -34,6 +35,7 @@ program.
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
+%patch0005 -p1
 
 %build
 %{__python} setup.py build
@@ -81,6 +83,10 @@ fi
 %{_datadir}/tripleo-image-elements
 
 %changelog
+* Tue Oct 07 2014 James Slagle <jslagle at redhat.com> 0.8.8-3
+- Merge pull request #1 from rwsu/swift-ports
+- Associate default images to storage roles
+
 * Tue Oct 07 2014 James Slagle <jslagle at redhat.com> 0.8.8-2
 - Associate default images to storage roles
 - Load the storage roles in Tuskar if they exist