From 822a8d4a966374c58b7f9f0032d24116bfeb4542 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Tue, 13 Jan 2015 11:24:10 -0500
Subject: [PATCH] [Keystone] Fix keystone::endpoint deprecation

- Change keystone::endpoint in favor of keystone::resource::service_identity

Change-Id: I1b8c0a3ccd45046050b5bd0ee38f8212fe6db4e4
(cherry picked from commit 3725cb12da924ad706fd9f07689241a0b213ce86)
---
 packstack/puppet/templates/keystone.pp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp
index fc17a8a2f..7f04e541d 100644
--- a/packstack/puppet/templates/keystone.pp
+++ b/packstack/puppet/templates/keystone.pp
@@ -29,11 +29,15 @@ class { 'keystone::roles::admin':
   admin_tenant => 'admin',
 }
 
-class { 'keystone::endpoint':
-  public_url   => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
-  internal_url => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
-  admin_url    => "http://${keystone_endpoint_cfg_ctrl_host}:35357",
-  region       => hiera('CONFIG_KEYSTONE_REGION'),
+keystone::resource::service_identity { 'keystone':
+  public_url          => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
+  internal_url        => "http://${keystone_endpoint_cfg_ctrl_host}:5000",
+  admin_url           => "http://${keystone_endpoint_cfg_ctrl_host}:35357",
+  region              => hiera('CONFIG_KEYSTONE_REGION'),
+  service_type        => 'identity',
+  service_description => 'OpenStack Identity Service',
+  configure_user      => false,
+  configure_user_role => false,
 }
 
 # Run token flush every minute (without output so we won't spam admins)