From 9cc14a9042cb5b6e8385406451ae9c079930e321 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Wed, 21 Nov 2012 12:48:19 -0500
Subject: [PATCH] Adding the ability to specify https for the public endpoint

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

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 453d003a..57d67b96 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -5,7 +5,8 @@ class swift::keystone::auth(
   $port      = '8080',
   $tenant    = 'services',
   $email     = 'swift@localhost',
-  $region    = 'RegionOne'
+  $region    = 'RegionOne',
+  $public_protocol = 'http'
 ) {
 
   keystone_user { $auth_name:
@@ -27,7 +28,7 @@ class swift::keystone::auth(
   }
   keystone_endpoint { "${region}/${auth_name}":
     ensure       => present,
-    public_url   => "http://${address}:${port}/v1/AUTH_%(tenant_id)s",
+    public_url   => "${public_protocol}://${address}:${port}/v1/AUTH_%(tenant_id)s",
     admin_url    => "http://${address}:${port}/",
     internal_url => "http://${address}:${port}/v1/AUTH_%(tenant_id)s",
   }
@@ -39,7 +40,7 @@ class swift::keystone::auth(
   }
   keystone_endpoint { "${region}/${auth_name}_s3":
     ensure       => present,
-    public_url   => "http://${address}:${port}",
+    public_url   => "${public_protocol}://${address}:${port}",
     admin_url    => "http://${address}:${port}",
     internal_url => "http://${address}:${port}",
   }