openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Merge "Allways set key_manager/api_class to an existing class path"

This commit is contained in:
Jenkins 2017-09-27 00:53:08 +00:00 committed by Gerrit Code Review
parent f21f5864e9 d9759d2488
commit 8334c21dcc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cinder.pp
View File

@ -76,7 +76,9 @@ class openstack_integration::cinder (
$keymgr_encryption_api_url = "${::openstack_integration::config::base_url}:9311"
$keymgr_encryption_auth_url = "${::openstack_integration::config::keystone_auth_uri}/v3"
} else {
$keymgr_api_class = undef
# (TODO) amoralej - we need to define api_class until fix https://review.openstack.org/#/c/468252 in
# cinder is merged to unblock puppet promotion
$keymgr_api_class = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'
$keymgr_encryption_api_url = undef
$keymgr_encryption_auth_url = undef
}