From 8f9a2b588a96cefa561ef1091b5253dd1338248d Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 30 Aug 2016 19:16:57 -0400
Subject: [PATCH] cinder: disable barbican

things are unstable now, let's disable it until we stabilize it.

Change-Id: I7cf25ffc2a25964c6d688fbfa58efbe09f9f75f2
---
 manifests/cinder.pp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/manifests/cinder.pp b/manifests/cinder.pp
index 7c50918a1..88c2c879a 100644
--- a/manifests/cinder.pp
+++ b/manifests/cinder.pp
@@ -80,12 +80,13 @@ class openstack_integration::cinder (
     memcached_servers   => $::openstack_integration::config::memcached_servers,
   }
   class { '::cinder::api':
-    default_volume_type        => 'BACKEND_1',
-    public_endpoint            => "${::openstack_integration::config::base_url}:8776",
-    service_name               => 'httpd',
-    keymgr_api_class           => $keymgr_api_class,
-    keymgr_encryption_api_url  => $keymgr_encryption_api_url,
-    keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
+    default_volume_type => 'BACKEND_1',
+    public_endpoint     => "${::openstack_integration::config::base_url}:8776",
+    service_name        => 'httpd',
+    # TODO(emilien) Re-enable later when things are stable again.
+    # keymgr_api_class           => $keymgr_api_class,
+    # keymgr_encryption_api_url  => $keymgr_encryption_api_url,
+    # keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
   }
   include ::apache
   class { '::cinder::wsgi::apache':