From 0476b9bf1ca4c8ef4eab4c9060e5df9c123096e6 Mon Sep 17 00:00:00 2001 From: Ivan Chavero Date: Tue, 1 Mar 2016 22:58:27 -0700 Subject: [PATCH] Remove S3 endpoint The Swift S3 endpoint is being enabled without user intervention or configuration directive, since packstack does not suppor this feature it had to be removed. Change-Id: Iee381a0937266083e023e7fad69ad6c61048cf98 --- packstack/puppet/templates/keystone_swift.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packstack/puppet/templates/keystone_swift.pp b/packstack/puppet/templates/keystone_swift.pp index 6671153f7..87ce47f14 100644 --- a/packstack/puppet/templates/keystone_swift.pp +++ b/packstack/puppet/templates/keystone_swift.pp @@ -2,7 +2,6 @@ $swift_protocol = 'http' $swift_host = hiera('CONFIG_STORAGE_HOST_URL') $swift_port = '8080' $swift_url = "${swift_protocol}://${swift_host}:$swift_port/v1/AUTH_%%(tenant_id)s" -$swift_v3_url = "${swift_protocol}://${swift_host}:$swift_port" class { '::swift::keystone::auth': region => hiera('CONFIG_KEYSTONE_REGION'), @@ -11,7 +10,5 @@ class { '::swift::keystone::auth': public_url => $swift_url, internal_url => $swift_url, admin_url => $swift_url, - public_url_s3 => $swift_v3_url, - internal_url_s3 => $swift_v3_url, - admin_url_s3 => $swift_v3_url, + configure_s3_endpoint => false, }