openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Remove keymgr_api_class option in nova.pp"

Browse Source
This commit is contained in:
Zuul 2018-10-22 02:06:15 +00:00 committed by Gerrit Code Review
commit 770cded75e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/nova.pp
View File

@ -172,11 +172,11 @@ class openstack_integration::nova (
class { '::nova::consoleauth': } class { '::nova::consoleauth': }
class { '::nova::cron::archive_deleted_rows': } class { '::nova::cron::archive_deleted_rows': }
if $volume_encryption { 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" $keymgr_auth_endpoint = "${::openstack_integration::config::keystone_auth_uri}/v3"
$barbican_endpoint = "${::openstack_integration::config::base_url}:9311" $barbican_endpoint = "${::openstack_integration::config::base_url}:9311"
} else { } else {
$keymgr_api_class = undef $keymgr_backend = undef
$keymgr_auth_endpoint = undef $keymgr_auth_endpoint = undef
$barbican_endpoint = undef $barbican_endpoint = undef
} }
@ -184,7 +184,7 @@ class openstack_integration::nova (
vnc_enabled => true, vnc_enabled => true,
instance_usage_audit => true, instance_usage_audit => true,
instance_usage_audit_period => 'hour', instance_usage_audit_period => 'hour',
keymgr_api_class => $keymgr_api_class, keymgr_backend => $keymgr_backend,
barbican_auth_endpoint => $keymgr_auth_endpoint, barbican_auth_endpoint => $keymgr_auth_endpoint,
barbican_endpoint => $barbican_endpoint, barbican_endpoint => $barbican_endpoint,
} }