From c0318f0e1b86fa5d6f40942fd1b9a1f6842a5c60 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Fri, 21 Nov 2014 10:06:47 -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: Iafbe248ef0314b8abc31d22a7631df51e23f2c48
Implements: blueprint common-openstack-identity-resource
---
 manifests/keystone/auth.pp | 45 ++++++++++++++------------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index b17a7d0..2f8d9d8 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -125,43 +125,32 @@ class ceilometer::keystone::auth (
     $real_service_name = $auth_name
   }
 
-  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 Metering Service',
+    service_name        => $real_service_name,
+    region              => $region,
+    password            => $password,
+    email               => $email,
+    tenant              => $tenant,
+    roles               => ['admin', 'ResellerAdmin'],
+    public_url          => $public_url_real,
+    admin_url           => $admin_url_real,
+    internal_url        => $internal_url_real,
   }
 
   if $configure_user_role {
-    Keystone_user_role["${auth_name}@${tenant}"] ~>
-      Service <| name == 'ceilometer-api' |>
-
     if !defined(Keystone_role['ResellerAdmin']) {
       keystone_role { 'ResellerAdmin':
         ensure => present,
       }
     }
-    keystone_user_role { "${auth_name}@${tenant}":
-      ensure  => present,
-      roles   => ['admin', 'ResellerAdmin'],
-      require => Keystone_role['ResellerAdmin'],
-    }
+    Keystone_role['ResellerAdmin'] -> Keystone_user_role["${auth_name}@${tenant}"] ~>
+      Service <| name == 'ceilometer-api' |>
   }
 
-  keystone_service { $real_service_name:
-    ensure      => present,
-    type        => $service_type,
-    description => 'Openstack Metering Service',
-  }
-  if $configure_endpoint {
-    keystone_endpoint { "${region}/${real_service_name}":
-      ensure       => present,
-      public_url   => $public_url_real,
-      admin_url    => $admin_url_real,
-      internal_url => $internal_url_real,
-    }
-  }
 }
 
-- 
2.45.2