openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "trove: Use new service_credentials classes"

Browse Source
This commit is contained in:
Zuul 2022-03-08 01:02:08 +00:00 committed by Gerrit Code Review
commit f3d3adc0cd
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/trove.pp
View File

@ -42,7 +42,6 @@ class openstack_integration::trove {
database_connection => 'mysql+pymysql://trove:trove@127.0.0.1/trove?charset=utf8', database_connection => 'mysql+pymysql://trove:trove@127.0.0.1/trove?charset=utf8',
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
amqp_sasl_mechanisms => 'PLAIN', amqp_sasl_mechanisms => 'PLAIN',
nova_proxy_admin_pass => 'a_big_secret',
} }
class { 'trove::db::mysql': class { 'trove::db::mysql':
charset => $::openstack_integration::params::mysql_charset, charset => $::openstack_integration::params::mysql_charset,
@ -62,6 +61,10 @@ class openstack_integration::trove {
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
} }
class { 'trove::api::service_credentials':
password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_auth_uri,
}
class { 'trove::api': class { 'trove::api':
bind_host => $::openstack_integration::config::host, bind_host => $::openstack_integration::config::host,
workers => 2, workers => 2,
@ -69,14 +72,24 @@ class openstack_integration::trove {
key_file => $key_file, key_file => $key_file,
} }
class { 'trove::client': } class { 'trove::client': }
class { 'trove::conductor::service_credentials':
password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_auth_uri
}
class { 'trove::conductor': class { 'trove::conductor':
debug => true, debug => true,
workers => 2, workers => 2,
auth_url => $::openstack_integration::config::keystone_auth_uri, }
class { 'trove::taskmanager::service_credentials':
password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_auth_uri
}
class { 'trove::guestagent::service_credentials':
password => 'a_big_secret',
auth_url => $::openstack_integration::config::keystone_auth_uri
} }
class { 'trove::taskmanager': class { 'trove::taskmanager':
debug => true, debug => true,
auth_url => $::openstack_integration::config::keystone_auth_uri,
use_guestagent_template => false, use_guestagent_template => false,
} }
class { 'trove::quota': } class { 'trove::quota': }