From c340ac5f46d5fb6355477b9714bfcf9137480fa3 Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Wed, 21 Nov 2012 12:56:07 -0500
Subject: [PATCH] Adding the ability to specify https for the public endpoint
---
manifests/keystone/auth.pp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 420d6f6f7..f893291dd 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -12,7 +12,8 @@ class nova::keystone::auth(
$region = 'RegionOne',
$tenant = 'services',
$email = 'nova@localhost',
- $cinder = false
+ $cinder = false,
+ $public_protocol = 'http'
) {
keystone_user { $auth_name:
@@ -32,7 +33,7 @@ class nova::keystone::auth(
}
keystone_endpoint { "${region}/${auth_name}":
ensure => present,
- public_url => "http://${public_address}:${compute_port}/${compute_version}/%(tenant_id)s",
+ public_url => "${public_protocol}://${public_address}:${compute_port}/${compute_version}/%(tenant_id)s",
admin_url => "http://${admin_address}:${compute_port}/${compute_version}/%(tenant_id)s",
internal_url => "http://${internal_address}:${compute_port}/${compute_version}/%(tenant_id)s",
}
@@ -45,7 +46,7 @@ class nova::keystone::auth(
}
keystone_endpoint { "${region}/${auth_name}_volume":
ensure => present,
- public_url => "http://${public_address}:${volume_port}/${volume_version}/%(tenant_id)s",
+ public_url => "${public_protocol}://${public_address}:${volume_port}/${volume_version}/%(tenant_id)s",
admin_url => "http://${admin_address}:${volume_port}/${volume_version}/%(tenant_id)s",
internal_url => "http://${internal_address}:${volume_port}/${volume_version}/%(tenant_id)s",
}
@@ -58,7 +59,7 @@ class nova::keystone::auth(
}
keystone_endpoint { "${region}/${auth_name}_ec2":
ensure => present,
- public_url => "http://${public_address}:${ec2_port}/services/Cloud",
+ public_url => "${public_protocol}://${public_address}:${ec2_port}/services/Cloud",
admin_url => "http://${admin_address}:${ec2_port}/services/Admin",
internal_url => "http://${internal_address}:${ec2_port}/services/Cloud",
}