From fcf0b0d9d9dd7b14794cdb2468451ee2bfc41754 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Thu, 7 Feb 2013 01:27:29 -0500
Subject: [PATCH] Removing references to s3

We were not using them anyways and they cause problems with puppet 3

Change-Id: Ibaa5b085e2b0d23a7278f6740bf65b92bac16ea6
---
 packstack/puppet/templates/swift_proxy.pp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packstack/puppet/templates/swift_proxy.pp b/packstack/puppet/templates/swift_proxy.pp
index 9845de4dc..94944ce8d 100644
--- a/packstack/puppet/templates/swift_proxy.pp
+++ b/packstack/puppet/templates/swift_proxy.pp
@@ -11,8 +11,6 @@ class { 'swift::proxy':
     'healthcheck',
     'cache',
 #    'ratelimit',
-#    'swift3',
-#    's3token',
     'authtoken',
     'keystone',
     'proxy-server'
@@ -25,7 +23,6 @@ class { [
     'swift::proxy::catch_errors',
     'swift::proxy::healthcheck',
     'swift::proxy::cache',
-    'swift::proxy::swift3',
 ]: }
 
 class { 'swift::proxy::ratelimit':
@@ -36,12 +33,6 @@ class { 'swift::proxy::ratelimit':
     account_ratelimit      => 0
 }
 
-class { 'swift::proxy::s3token':
-    # assume that the controller host is the swift api server
-    auth_host     => $controller_node_public,
-    auth_port     => '35357',
-}
-
 class { 'swift::proxy::keystone':
     operator_roles => ['admin', 'SwiftOperator'],
 }