[openstack-tripleo-heat-templates] Updated patches from master-patches

[slagle]

commit cf7e9af758ae25e3fcb6561f29b02e4b8e9c39d7
Author: James Slagle <jslagle at redhat.com>
Date:   Tue Oct 21 09:09:02 2014 -0400

    Updated patches from master-patches

 ...erted-version-of-block-and-object-storage.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/0002-Add-converted-version-of-block-and-object-storage.patch b/0002-Add-converted-version-of-block-and-object-storage.patch
index 7ebc548..b314204 100644
--- a/0002-Add-converted-version-of-block-and-object-storage.patch
+++ b/0002-Add-converted-version-of-block-and-object-storage.patch
@@ -1,4 +1,4 @@
-From 7d03413cf3985d1ea3a0fa727292b7297f0535c3 Mon Sep 17 00:00:00 2001
+From 0cef615367b10d3828e72520a8a20e23b66dc155 Mon Sep 17 00:00:00 2001
 From: Peter Belanyi <pbelanyi at redhat.com>
 Date: Wed, 24 Sep 2014 07:51:13 -0400
 Subject: [PATCH] Add converted version of block and object storage
@@ -467,7 +467,7 @@ index cb4f25c..94770a8 100644
      type: OS::Heat::StructuredConfig
 diff --git a/swift-storage.yaml b/swift-storage.yaml
 new file mode 100644
-index 0000000..86731fd
+index 0000000..68fd8a4
 --- /dev/null
 +++ b/swift-storage.yaml
 @@ -0,0 +1,168 @@
@@ -533,7 +533,7 @@ index 0000000..86731fd
 +    description: Name of an existing EC2 KeyPair to enable SSH access to the instances
 +    type: string
 +  NeutronEnableTunnelling:
-+    default: true
++    default: "True"
 +    type: string
 +  NeutronNetworkType:
 +    default: gre