From c373965dc8f7e4be0b15790ffc03c210dd2be23a Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Thu, 18 Jun 2015 16:38:25 -0600
Subject: [PATCH] support for keystone v3 api - keystone::endpoint

This patch implements these parts of the blueprint:

1) Adds support for domains to keystone::endpoint
Users of this resource may specify a different domain for both the user
and the tenant/project, or may specify the default domain which will apply
to both user and tenant.

Change-Id: Ife47a7627a8a4138b022a1cbb1d42f256e5a6c63
Implements: blueprint api-v3-support
---
 manifests/endpoint.pp                  | 20 ++++++++++++++++++++
 spec/classes/keystone_endpoint_spec.rb | 15 +++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/manifests/endpoint.pp b/manifests/endpoint.pp
index 6c821f475..ddf5c1368 100644
--- a/manifests/endpoint.pp
+++ b/manifests/endpoint.pp
@@ -22,6 +22,20 @@
 # [*version*]
 #   (optional) API version for endpoint. Appended to all endpoint urls. (Defaults to 'v2.0')
 #
+# [*user_domain*]
+#   (Optional) Domain for $auth_name
+#   Defaults to undef (use the keystone server default domain)
+#
+# [*project_domain*]
+#   (Optional) Domain for $tenant (project)
+#   Defaults to undef (use the keystone server default domain)
+#
+# [*default_domain*]
+#   (Optional) Domain for $auth_name and $tenant (project)
+#   If keystone_user_domain is not specified, use $keystone_default_domain
+#   If keystone_project_domain is not specified, use $keystone_default_domain
+#   Defaults to undef
+#
 # === Examples
 #
 #  class { 'keystone::endpoint':
@@ -36,6 +50,9 @@ class keystone::endpoint (
   $admin_url         = 'http://127.0.0.1:35357',
   $version           = 'v2.0',
   $region            = 'RegionOne',
+  $user_domain       = undef,
+  $project_domain    = undef,
+  $default_domain    = undef,
 ) {
 
   $public_url_real = "${public_url}/${version}"
@@ -56,6 +73,9 @@ class keystone::endpoint (
     admin_url           => $admin_url_real,
     internal_url        => $internal_url_real,
     region              => $region,
+    user_domain         => $user_domain,
+    project_domain      => $project_domain,
+    default_domain      => $default_domain,
   }
 
 }
diff --git a/spec/classes/keystone_endpoint_spec.rb b/spec/classes/keystone_endpoint_spec.rb
index 217d791f9..59390ec98 100644
--- a/spec/classes/keystone_endpoint_spec.rb
+++ b/spec/classes/keystone_endpoint_spec.rb
@@ -48,4 +48,19 @@ describe 'keystone::endpoint' do
       )
     end
   end
+
+  describe 'with domain parameters' do
+
+    let :params do
+      { :user_domain    => 'userdomain',
+        :project_domain => 'projectdomain',
+        :default_domain => 'defaultdomain' }
+    end
+
+    it { is_expected.to contain_keystone__resource__service_identity('keystone').with(
+      :user_domain    => 'userdomain',
+      :project_domain => 'projectdomain',
+      :default_domain => 'defaultdomain'
+    )}
+  end
 end