From b895d1062940558d2a7762601c65a7212b3f7f42 Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Thu, 3 Apr 2014 18:50:59 +0100
Subject: [PATCH] Add bulk support

---
 templates/icehouse/proxy-server.conf | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/icehouse/proxy-server.conf b/templates/icehouse/proxy-server.conf
index 29e703c..df18ac5 100644
--- a/templates/icehouse/proxy-server.conf
+++ b/templates/icehouse/proxy-server.conf
@@ -9,10 +9,10 @@ key_file = {{ ssl_key }}
 
 {% if auth_type == 'keystone' %}
 [pipeline:main]
-pipeline =  healthcheck cache swift3 s3token authtoken keystoneauth staticweb container-quotas account-quotas proxy-server
+pipeline = healthcheck cache swift3 s3token bulk authtoken keystoneauth staticweb container-quotas account-quotas proxy-server
 {% else %}
 [pipeline:main]
-pipeline = healthcheck cache tempauth staticweb container-quotas account-quotas proxy-server
+pipeline = healthcheck cache bulk tempauth staticweb container-quotas account-quotas proxy-server
 {% endif %}
 
 [app:proxy-server]
@@ -40,6 +40,9 @@ use = egg:swift#container_quotas
 [filter:staticweb]
 use = egg:swift#staticweb
 
+[filter:bulk]
+use = egg:swift#bulk
+
 {% if auth_type == 'keystone' %}
 [filter:keystoneauth]
 use = egg:swift#keystoneauth