openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Remove cinder::ceilometer usage"

Browse Source
This commit is contained in:
Zuul 2020-04-07 22:58:52 +00:00 committed by Gerrit Code Review
commit 689a67320f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/cinder.pp
View File

@ -57,18 +57,13 @@ class openstack_integration::cinder (
debug => true,
}
class { 'cinder':
default_transport_url => os_transport_url({
default_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_default_proto,
'host' => $::openstack_integration::config::host,
'port' => $::openstack_integration::config::messaging_default_port,
'username' => 'cinder',
'password' => 'an_even_bigger_secret',
}),
database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8',
rabbit_use_ssl => $::openstack_integration::config::ssl,
amqp_sasl_mechanisms => 'PLAIN',
}
class { 'cinder::ceilometer':
notification_transport_url => os_transport_url({
'transport' => $::openstack_integration::config::messaging_notify_proto,
'host' => $::openstack_integration::config::host,
@ -78,6 +73,9 @@ class openstack_integration::cinder (
}),
notification_topics => $notification_topics,
notification_driver => 'messagingv2',
database_connection => 'mysql+pymysql://cinder:cinder@127.0.0.1/cinder?charset=utf8',
rabbit_use_ssl => $::openstack_integration::config::ssl,
amqp_sasl_mechanisms => 'PLAIN',
}
if $volume_encryption {
$keymgr_backend = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager'