From 87ab008565303cf813e4b21ad9da036a43fb144c Mon Sep 17 00:00:00 2001
From: Joe Topjian <joe@topjian.net>
Date: Sun, 28 Oct 2012 13:28:35 -0600
Subject: [PATCH] Region changes

---
 manifests/keystone/auth.pp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index b05475c7..d0551e6e 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -2,7 +2,8 @@ class swift::keystone::auth(
   $auth_name = 'swift',
   $password  = 'swift_password',
   $address   = '127.0.0.1',
-  $port      = '8080'
+  $port      = '8080',
+  $region    = 'RegionOne'
 ) {
 
   keystone_user { $auth_name:
@@ -20,9 +21,8 @@ class swift::keystone::auth(
     type        => 'object-store',
     description => 'Openstack Object-Store Service',
   }
-  keystone_endpoint { $auth_name:
+  keystone_endpoint { "${region}/${auth_name}":
     ensure       => present,
-    region       => 'RegionOne',
     public_url   => "http://${address}:${port}/v1/AUTH_%(tenant_id)s",
     admin_url    => "http://${address}:${port}/",
     internal_url => "http://${address}:${port}/v1/AUTH_%(tenant_id)s",
@@ -33,9 +33,8 @@ class swift::keystone::auth(
     type        => 's3',
     description => 'Openstack S3 Service',
   }
-  keystone_endpoint { "${auth_name}_s3":
+  keystone_endpoint { "${region}/${auth_name}_s3":
     ensure       => present,
-    region       => 'RegionOne',
     public_url   => "http://${address}:${port}",
     admin_url    => "http://${address}:${port}",
     internal_url => "http://${address}:${port}",