[openstack-tripleo-image-elements/f21] Revert "Update to upstream 0.8.7"

[slagle]

commit df6b88d830ee185f7d360c96698bd08a4e975a5e
Author: James Slagle <jslagle at redhat.com>
Date:   Fri Oct 3 07:59:01 2014 -0400

    Revert "Update to upstream 0.8.7"
    
    This reverts commit 98cea2af09b610829b91b3cc1356b1e4ba88e71d.

 .gitignore                            |    1 -
 0001-Cinder-conf-patch.patch          |   20 ++++++++++++--------
 openstack-tripleo-image-elements.spec |    5 +----
 sources                               |    2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc1ee4d..5f0799e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /tripleo-image-elements-0.6.3.tar.gz
 /tripleo-image-elements-0.6.5.tar.gz
 /tripleo-image-elements-0.7.6.tar.gz
-/tripleo-image-elements-0.8.7.tar.gz
diff --git a/0001-Cinder-conf-patch.patch b/0001-Cinder-conf-patch.patch
index 4295afe..8700eb5 100644
--- a/0001-Cinder-conf-patch.patch
+++ b/0001-Cinder-conf-patch.patch
@@ -1,24 +1,28 @@
-From d042d70dc9b4f5f6268af7a74470bef1d7172729 Mon Sep 17 00:00:00 2001
+From bc648e69add9561678479ecb96491cc5d4531593 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
 
 ---
- elements/cinder/os-apply-config/etc/cinder/cinder.conf | 4 ++++
- 1 file changed, 4 insertions(+)
+ elements/cinder/os-apply-config/etc/cinder/cinder.conf | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/elements/cinder/os-apply-config/etc/cinder/cinder.conf b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
-index e26d0de..f177d37 100644
+index e3e84cc..f31df3a 100644
 --- a/elements/cinder/os-apply-config/etc/cinder/cinder.conf
 +++ b/elements/cinder/os-apply-config/etc/cinder/cinder.conf
-@@ -24,6 +24,10 @@ osapi_volume_listen = {{local-ipv4}}
- state_path = /mnt/state/var/lib/cinder
+@@ -12,9 +12,13 @@ verbose={{cinder.verbose}}
+ debug={{cinder.debug}}
+ {{/cinder.debug}}
+ 
+-state_path = /mnt/state/var/lib/cinder
  api_paste_config = /etc/cinder/api-paste.ini
  
++state_path = /mnt/state/var/lib/cinder
 +lock_path = /mnt/state/var/lib/cinder
 +volumes_dir = /mnt/state/var/lib/cinder/volumes
 +iscsi_helper = tgtadm
 +
  {{#cinder.include_nfs_backend}}
- # If shared NFS backend is used, we need to set same host for
- # all cinder-volume instances as a workaround for bug
+ nfs_shares_config=/etc/cinder/shares.txt
+ nfs_mount_point_base=/mnt/state/var/lib/cinder/nfs
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index a9214f7..9150aeb 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -3,7 +3,7 @@
 
 Name:		openstack-tripleo-image-elements
 Summary:	OpenStack TripleO Image Elements for diskimage-builder
-Version:	0.8.7
+Version:	0.7.6
 Release:	1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
@@ -75,9 +75,6 @@ fi
 %{_datadir}/tripleo-image-elements
 
 %changelog
-* Mon Sep 29 2014 James Slagle <jslagle at redhat.com> 0.8.7-1
-- Update to upstream 0.8.7
-
 * Mon Sep 15 2014 James Slagle <jslagle at redhat.com> 0.7.6-1
 - Update to upstream 0.7.6
 
diff --git a/sources b/sources
index cc0a6a8..55162ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97401a730ec33084d9c8a30902a1ffe6  tripleo-image-elements-0.8.7.tar.gz
+e82da89d9d3eebbcccc4e10ff5d41d01  tripleo-image-elements-0.7.6.tar.gz