From 6bbb1490cf471f9c580c3209491ae9bc18676bba Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Wed, 28 Jan 2015 08:01:06 -0500
Subject: [PATCH] Swift: fix two errors in proxy configuration

- fix a typo for logging class
- drop dupplicate resource for ceilometer log file (already managed in
  puppet-swift)

Change-Id: Ib006010176264103a31f2c3cc637ef4a2f383e35
---
 manifests/object/controller.pp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/manifests/object/controller.pp b/manifests/object/controller.pp
index 16f5c6b0..f2239847 100644
--- a/manifests/object/controller.pp
+++ b/manifests/object/controller.pp
@@ -125,7 +125,7 @@ log_statsd_default_sample_rate = 1
   class { 'swift::proxy::container_quotas': }
   class { 'swift::proxy::formpost': }
   class { 'swift::proxy::healthcheck': }
-  class { 'swift::proxy::proxy-logging': }
+  class { 'swift::proxy::proxy_logging': }
   class { 'swift::proxy::ratelimit': }
   class { 'swift::proxy::slo': }
   class { 'swift::proxy::staticweb': }
@@ -159,15 +159,6 @@ cache = swift.cache')
     endpoint_type => 'internalURL'
   }
 
-  # Note(sileht): log file should exists to swift proxy to write to
-  # the ceilometer directory
-  file{'/var/log/ceilometer/swift-proxy-server.log':
-    ensure => present,
-    owner  => 'swift',
-    group  => 'swift',
-    notify => Service['swift-proxy']
-  }
-
   Swift::Ringsync<<| |>> #~> Service["swift-proxy"]
 
   if $::cloud::manage_firewall {