From bbb361cf9f24d311f87afcaddb08294e65db9cd8 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 17 Oct 2018 11:04:59 +0800
Subject: [PATCH] Remove keymgr_api_class option in nova.pp

The keymgr_api_class parameter is deprecated, use keymgr_backend instead.

https://review.openstack.org/#/c/515058/

Change-Id: I44da6a0c277a2d4400708270883a5f44348af143
---
 manifests/nova.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/nova.pp b/manifests/nova.pp
index ff4656909..8a960c56c 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -172,11 +172,11 @@ class openstack_integration::nova (
   class { '::nova::consoleauth': }
   class { '::nova::cron::archive_deleted_rows': }
   if $volume_encryption {
-    $keymgr_api_class     = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'
+    $keymgr_backend       = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'
     $keymgr_auth_endpoint = "${::openstack_integration::config::keystone_auth_uri}/v3"
     $barbican_endpoint    = "${::openstack_integration::config::base_url}:9311"
   } else {
-    $keymgr_api_class     = undef
+    $keymgr_backend       = undef
     $keymgr_auth_endpoint = undef
     $barbican_endpoint    = undef
   }
@@ -184,7 +184,7 @@ class openstack_integration::nova (
     vnc_enabled                 => true,
     instance_usage_audit        => true,
     instance_usage_audit_period => 'hour',
-    keymgr_api_class            => $keymgr_api_class,
+    keymgr_backend              => $keymgr_backend,
     barbican_auth_endpoint      => $keymgr_auth_endpoint,
     barbican_endpoint           => $barbican_endpoint,
   }