[openstack-tripleo-image-elements] Updated patches from master-patches

[slagle]

commit 79c46f69443f8bdaef20a9a5df767e97c6bfdc5b
Author: James Slagle <jslagle at redhat.com>
Date:   Mon Sep 15 10:46:33 2014 -0400

    Updated patches from master-patches

 ...onf-patch.patch => 0001-Cinder-conf-patch.patch |    2 +-
 0001-Remove-mostly-empty-directories.patch         |   45 ---
 0002-Fix-tgt-target-in-cinder-element.patch        |   29 --
 0003-Fix-horizon-local_settings.py.patch           |  132 ---------
 0004-No-neutron-db-manage-upgrade-head.patch       |   18 --
 ...nd-use-libvirtd-group-for-package-install.patch |   28 --
 0006-Remove-swift-container-sync-service.patch     |   46 ---
 ...-out-tgt-specific-parts-of-cinder-element.patch |  129 ---------
 0009-Update-keystone-s-selinux-policies.patch      |   58 ----
 0010-Update-neutron-s-selinux-policies.patch       |   64 -----
 0011-Update-glance-s-selinux-policies.patch        |   58 ----
 0012-Update-nova-s-selinux-policies.patch          |   41 ---
 0013-Update-swift-s-selinux-policies.patch         |   60 ----
 ...Allow-install-mariadb-from-RDO-repository.patch |  299 --------------------
 0015-Make-innodb-pool-size-configurable.patch      |   36 ---
 0016-Fix-var-lib-mysql-selinux-labeling.patch      |   24 --
 0017-Fix-rabbitmq-server-selinux-labeling.patch    |   45 ---
 0018-Ability-to-change-default-swift-ports.patch   |  102 -------
 0019-Move-rabbitmq-server-cluster-port.patch       |  107 -------
 openstack-tripleo-image-elements.spec              |   38 +---
 20 files changed, 2 insertions(+), 1359 deletions(-)
---
diff --git a/0008-Cinder-conf-patch.patch b/0001-Cinder-conf-patch.patch
similarity index 93%
rename from 0008-Cinder-conf-patch.patch
rename to 0001-Cinder-conf-patch.patch
index 6f6b1c0..092390f 100644
--- a/0008-Cinder-conf-patch.patch
+++ b/0001-Cinder-conf-patch.patch
@@ -1,4 +1,4 @@
-From 183b40e19722b6c0427bef7c882c7616382c68b5 Mon Sep 17 00:00:00 2001
+From 9e3cd97cd996b47f34d7f508e75c939de7e42fce Mon Sep 17 00:00:00 2001
 From: James Slagle <jslagle at redhat.com>
 Date: Wed, 3 Sep 2014 13:20:59 -0400
 Subject: [PATCH] Cinder conf patch
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index 91de52a..0f35b7c 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -10,25 +10,7 @@ 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-Remove-mostly-empty-directories.patch
-Patch0002: 0002-Fix-tgt-target-in-cinder-element.patch
-Patch0003: 0003-Fix-horizon-local_settings.py.patch
-Patch0004: 0004-No-neutron-db-manage-upgrade-head.patch
-Patch0005: 0005-Create-and-use-libvirtd-group-for-package-install.patch
-Patch0006: 0006-Remove-swift-container-sync-service.patch
-Patch0007: 0007-Factor-out-tgt-specific-parts-of-cinder-element.patch
-Patch0008: 0008-Cinder-conf-patch.patch
-Patch0009: 0009-Update-keystone-s-selinux-policies.patch
-Patch0010: 0010-Update-neutron-s-selinux-policies.patch
-Patch0011: 0011-Update-glance-s-selinux-policies.patch
-Patch0012: 0012-Update-nova-s-selinux-policies.patch
-Patch0013: 0013-Update-swift-s-selinux-policies.patch
-Patch0014: 0014-Allow-install-mariadb-from-RDO-repository.patch
-Patch0015: 0015-Make-innodb-pool-size-configurable.patch
-Patch0016: 0016-Fix-var-lib-mysql-selinux-labeling.patch
-Patch0017: 0017-Fix-rabbitmq-server-selinux-labeling.patch
-Patch0018: 0018-Ability-to-change-default-swift-ports.patch
-Patch0019: 0019-Move-rabbitmq-server-cluster-port.patch
+Patch0001: 0001-Cinder-conf-patch.patch
 
 BuildArch:	noarch
 BuildRequires:	python
@@ -46,24 +28,6 @@ program.
 %setup -q -n tripleo-image-elements-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-%patch0012 -p1
-%patch0013 -p1
-%patch0014 -p1
-%patch0015 -p1
-%patch0016 -p1
-%patch0017 -p1
-%patch0018 -p1
-%patch0019 -p1
 
 %build
 %{__python} setup.py build