From ac5c2bcf66f78ce5506585335e50a9f107c31c6a Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Wed, 19 Nov 2014 23:29:36 -0500
Subject: [PATCH] Refactorise Keystone resources management

Refactorise the code of Keystone resources management with backward
compatibility since we don't modify the unit tests.

Change-Id: If15a56de62d5d87d456cdc6aed1602aee5984124
Implements: blueprint common-openstack-identity-resource
---
 manifests/keystone/auth.pp | 40 +++++++++++++-------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index d325acef..b514f6eb 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -49,37 +49,25 @@ class glance::keystone::auth(
 
   Keystone_endpoint["${region}/${real_service_name}"]  ~> Service <| name == 'glance-api' |>
 
-  if $configure_user {
-    keystone_user { $auth_name:
-      ensure   => present,
-      password => $password,
-      email    => $email,
-      tenant   => $tenant,
-    }
+  keystone::resource::service_identity { $auth_name:
+    configure_user      => $configure_user,
+    configure_user_role => $configure_user_role,
+    configure_endpoint  => $configure_endpoint,
+    service_type        => $service_type,
+    service_description => 'Openstack Image Service',
+    service_name        => $real_service_name,
+    region              => $region,
+    password            => $password,
+    email               => $email,
+    tenant              => $tenant,
+    public_url          => "${public_protocol}://${public_address}:${port}",
+    admin_url           => "${admin_protocol}://${admin_address}:${port}",
+    internal_url        => "${internal_protocol}://${internal_address}:${port}",
   }
 
   if $configure_user_role {
     Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-registry' |>
     Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-api' |>
-
-    keystone_user_role { "${auth_name}@${tenant}":
-      ensure => present,
-      roles  => 'admin',
-    }
   }
 
-  keystone_service { $real_service_name:
-    ensure      => present,
-    type        => $service_type,
-    description => 'Openstack Image Service',
-  }
-
-  if $configure_endpoint {
-    keystone_endpoint { "${region}/${real_service_name}":
-      ensure       => present,
-      public_url   => "${public_protocol}://${public_address}:${port}",
-      admin_url    => "${admin_protocol}://${admin_address}:${port}",
-      internal_url => "${internal_protocol}://${internal_address}:${port}",
-    }
-  }
 }