From: Christian Schwede <cschwede@redhat.com>
Date: Fri, 28 Oct 2016 11:23:32 +0000 (+0200)
Subject: Fix Swift proxy pipeline ordering
X-Git-Tag: opnfv-6.0.0~1450^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=38fe61be95a0efbce32202f708f5bf2b1fe5b8e4;p=apex-tripleo-heat-templates.git

Fix Swift proxy pipeline ordering

The Ceilometer middleware is in the wrong place; actually any middleware
should be deployed after catch_errors to catch any errors that would
otherwise crash the proxy service. Additionally the ceilometer
middleware should be deployed after any authentication middleware.

Closes-Bug: 1637471
Co-Authored-By: Thiago da Silva <thiago@redhat.com>
Change-Id: I710ff2f51271a78582fa502e7eecfa687800c664
---

diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index de8daea5..35e21181 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -88,7 +88,6 @@ outputs:
               - ResellerAdmin
             swift::proxy::versioned_writes::allow_versioned_writes: true
             swift::proxy::pipeline:
-              - 'ceilometer'
               - 'catch_errors'
               - 'healthcheck'
               - 'proxy-logging'
@@ -101,6 +100,7 @@ outputs:
               - 'keystone'
               - 'staticweb'
               - 'versioned_writes'
+              - 'ceilometer'
               - 'proxy-logging'
               - 'proxy-server'
             swift::proxy::account_autocreate: true