openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Test deployment with ceilometermiddleware"

Browse Source
This commit is contained in:
Zuul 2024-07-29 15:32:32 +00:00 committed by Gerrit Code Review
commit 5357917db8
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fixtures/scenario002.pp
View File

@ -66,7 +66,9 @@ class { 'openstack_integration::neutron':
baremetal_enabled => true, baremetal_enabled => true,
metering_enabled => true, metering_enabled => true,
} }
include openstack_integration::swift class { 'openstack_integration::swift':
ceilometer_enabled => true,
}
class { 'openstack_integration::ironic': class { 'openstack_integration::ironic':
inspector_backend => 'swift', inspector_backend => 'swift',
send_power_notifications => true, send_power_notifications => true,

54
manifests/swift.pp
View File

@ -1,4 +1,12 @@
class openstack_integration::swift { # Configure the swift service
#
# [*ceilometer_enabled*]
# (Optional) Enable the ceilometer middleware
# Defaults to false
#
class openstack_integration::swift(
$ceilometer_enabled = false
){
include openstack_integration::config include openstack_integration::config
@ -46,17 +54,45 @@ class openstack_integration::swift {
swift_hash_path_suffix => 'secrete', swift_hash_path_suffix => 'secrete',
} }
if $ceilometer_enabled {
openstack_integration::mq_user { 'swift':
password => 'an_even_bigger_secret',
before => Anchor['swift::service::begin'],
}
class { 'swift::proxy::ceilometer':
auth_url => $::openstack_integration::config::keystone_admin_uri,
password => 'a_big_secret',
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' => 'swift',
'password' => 'an_even_bigger_secret',
}),
rabbit_use_ssl => $::openstack_integration::config::ssl,
}
$ceilometer_middleware = ['ceilometer']
# NOTE(tkajinam): ceilometermiddleware needs to query keystone api when
# proxy-server starts so ensure the keystone account is already created.
Keystone::Resource::Service_identity['swift'] -> Service['swift-proxy-server']
} else {
$ceilometer_middleware = []
}
$pipeline = [
'catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache',
'listing_formats', 'container_sync', 'bulk', 'tempurl', 'ratelimit',
'authtoken', 'keystone', 'copy', 'formpost', 'staticweb', 'container_quotas',
'account_quotas', 'slo', 'dlo', 'versioned_writes', 'symlink', 'proxy-logging'
] + $ceilometer_middleware + ['proxy-server']
# proxy server # proxy server
class { 'swift::proxy': class { 'swift::proxy':
proxy_local_net_ip => $::openstack_integration::config::host, proxy_local_net_ip => $::openstack_integration::config::host,
workers => 2, workers => 2,
pipeline => [ pipeline => $pipeline,
'catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging', 'cache',
'listing_formats', 'container_sync', 'bulk', 'tempurl', 'ratelimit',
'authtoken', 'keystone', 'copy', 'formpost', 'staticweb', 'container_quotas',
'account_quotas', 'slo', 'dlo', 'versioned_writes', 'symlink',
'proxy-logging', 'proxy-server'
],
node_timeout => 30, node_timeout => 30,
} }
include swift::proxy::catch_errors include swift::proxy::catch_errors
@ -73,7 +109,7 @@ class openstack_integration::swift {
include swift::proxy::ratelimit include swift::proxy::ratelimit
class { 'swift::proxy::authtoken': class { 'swift::proxy::authtoken':
www_authenticate_uri => "${::openstack_integration::config::keystone_auth_uri}/v3", www_authenticate_uri => "${::openstack_integration::config::keystone_auth_uri}/v3",
auth_url => "${::openstack_integration::config::keystone_admin_uri}/", auth_url => $::openstack_integration::config::keystone_admin_uri,
password => 'a_big_secret', password => 'a_big_secret',
service_token_roles_required => true, service_token_roles_required => true,
} }