From b921f69fd42c59330ca010d59c51fbfd2b402cb8 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <logan@bacoosta.com>
Date: Fri, 9 Aug 2013 19:42:13 +0000
Subject: [PATCH] Removes un-needed cinder parameter

Depends on https://review.openstack.org/#/c/41170/

Cinder is always the default now,
therefore this option is not needed.

Change-Id: I87677af8ebfb0a50ab9fc5a869954de493f156f1
---
 manifests/keystone.pp                   | 2 --
 spec/classes/openstack_keystone_spec.rb | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index b3f6dbe..eaa0e61 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -239,8 +239,6 @@ class openstack::keystone (
         admin_address    => $nova_admin_real,
         internal_address => $nova_internal_real,
         region           => $region,
-        # indicates that we should not create endpoints for nova-volumes
-        cinder           => true,
       }
     }
 
diff --git a/spec/classes/openstack_keystone_spec.rb b/spec/classes/openstack_keystone_spec.rb
index 53965ec..ff7b474 100644
--- a/spec/classes/openstack_keystone_spec.rb
+++ b/spec/classes/openstack_keystone_spec.rb
@@ -54,8 +54,7 @@ describe 'openstack::keystone' do
         :public_address   => params[:public_address],
         :admin_address    => params[:public_address],
         :internal_address => params[:public_address],
-        :region           => 'RegionOne',
-        :cinder           => true
+        :region           => 'RegionOne'
       )
     end
   end