openstack/puppet-openstack-integration
Code Issues Proposed changes

Use keymgr_* parameters in cinder class

Browse Source 
... because the same parameters in cinder::api class have been
deprecated.

Depends-on: https://review.opendev.org/#/c/739126/
Change-Id: I9407566f5a62bb79ddb48974e340c81d37e228f3
This commit is contained in:
Takashi Kajinami 2020-09-01 20:24:48 +09:00
parent 959b18038b
commit afe2bbd368
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/cinder.pp
View File

@ -56,6 +56,17 @@ class openstack_integration::cinder (
class { 'cinder::logging': class { 'cinder::logging':
debug => true, debug => true,
} }
if $volume_encryption {
$keymgr_backend = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'
$keymgr_encryption_api_url = "${::openstack_integration::config::base_url}:9311"
$keymgr_encryption_auth_url = "${::openstack_integration::config::keystone_auth_uri}/v3"
} else {
# (TODO) amoralej - we need to define api_class until fix https://review.opendev.org/#/c/468252 in
# cinder is merged to unblock puppet promotion
$keymgr_backend = 'cinder.keymgr.conf_key_mgr.ConfKeyManager'
$keymgr_encryption_api_url = undef
$keymgr_encryption_auth_url = undef
}
class { 'cinder': class { 'cinder':
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto, 'transport' => $::openstack_integration::config::messaging_default_proto,
@ -76,17 +87,9 @@ class openstack_integration::cinder (
database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8', database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8',
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
amqp_sasl_mechanisms => 'PLAIN', amqp_sasl_mechanisms => 'PLAIN',
} keymgr_backend => $keymgr_backend,
if $volume_encryption { keymgr_encryption_api_url => $keymgr_encryption_api_url,
$keymgr_backend = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager' keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
$keymgr_encryption_api_url = "${::openstack_integration::config::base_url}:9311"
$keymgr_encryption_auth_url = "${::openstack_integration::config::keystone_auth_uri}/v3"
} else {
# (TODO) amoralej - we need to define api_class until fix https://review.opendev.org/#/c/468252 in
# cinder is merged to unblock puppet promotion
$keymgr_backend = 'cinder.keymgr.conf_key_mgr.ConfKeyManager'
$keymgr_encryption_api_url = undef
$keymgr_encryption_auth_url = undef
} }
class { 'cinder::keystone::authtoken': class { 'cinder::keystone::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
@ -97,12 +100,9 @@ class openstack_integration::cinder (
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
} }
class { 'cinder::api': class { 'cinder::api':
default_volume_type => 'BACKEND_1', default_volume_type => 'BACKEND_1',
public_endpoint => "${::openstack_integration::config::base_url}:8776", public_endpoint => "${::openstack_integration::config::base_url}:8776",
service_name => 'httpd', service_name => 'httpd',
keymgr_backend => $keymgr_backend,
keymgr_encryption_api_url => $keymgr_encryption_api_url,
keymgr_encryption_auth_url => $keymgr_encryption_auth_url,
} }
include apache include apache
class { 'cinder::wsgi::apache': class { 'cinder::wsgi::apache':