Cleanup some warnings

1) Remove usage of verbose in Trove.
2) Rename Tempest parameter.
3) Rename Swift parameter.
4) Update parameters for Heat so we use 'password' auth_plugin.
5) Remove metering_secret, replaced by telemetry_secret.

Change-Id: Id770a7b03323b72ba37317e48085d9c15f106bc1
This commit is contained in:
Emilien Macchi 2016-05-20 10:02:32 +02:00
parent 6bcc7756fc
commit 83dc8eadf7
5 changed files with 3 additions and 6 deletions

View File

@ -27,7 +27,6 @@ class openstack_integration::ceilometer {
class { '::ceilometer':
telemetry_secret => 'secrete',
metering_secret => 'secrete',
rabbit_userid => 'ceilometer',
rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url,

View File

@ -38,7 +38,7 @@ class openstack_integration::heat {
rabbit_port => $::openstack_integration::config::rabbit_port,
database_connection => 'mysql+pymysql://heat:heat@127.0.0.1/heat?charset=utf8',
identity_uri => $::openstack_integration::config::keystone_auth_uri,
auth_uri => $::openstack_integration::config::keystone_admin_uri,
auth_plugin => 'password',
keystone_password => 'a_big_secret',
debug => true,
}

View File

@ -5,7 +5,7 @@ class openstack_integration::swift {
# TODO(emilien): deploy memcached in IPv6
include ::memcached
class { '::swift':
swift_hash_suffix => 'secrete',
swift_hash_path_suffix => 'secrete',
}
class { '::swift::proxy':
proxy_local_net_ip => $::openstack_integration::config::host,

View File

@ -90,7 +90,7 @@ class openstack_integration::tempest (
identity_uri => "${::openstack_integration::config::keystone_auth_uri}/v2.0",
identity_uri_v3 => "${::openstack_integration::config::keystone_auth_uri}/v3",
admin_username => 'admin',
admin_tenant_name => 'openstack',
admin_project_name => 'openstack',
admin_password => 'a_big_secret',
admin_domain_name => 'Default',
auth_version => 'v3',

View File

@ -61,13 +61,11 @@ class openstack_integration::trove {
class { '::trove::client': }
class { '::trove::conductor':
debug => true,
verbose => true,
workers => 2,
auth_url => $::openstack_integration::config::keystone_auth_uri,
}
class { '::trove::taskmanager':
debug => true,
verbose => true,
auth_url => $::openstack_integration::config::keystone_auth_uri,
use_guestagent_template => false,
}