Drop usage of deprecated verbose option

Change-Id: Ia4ba77e4ea6e2afe591772cb33cd4ca0080ef6a6
This commit is contained in:
Emilien Macchi 2016-05-15 23:30:50 +02:00
parent 1c8c0d7c03
commit 6bcc7756fc
12 changed files with 1 additions and 13 deletions

View File

@ -40,7 +40,6 @@ class openstack_integration::aodh {
rabbit_password => 'an_even_bigger_secret', rabbit_password => 'an_even_bigger_secret',
rabbit_port => $::openstack_integration::config::rabbit_port, rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
verbose => true,
debug => true, debug => true,
rabbit_host => $::openstack_integration::config::ip_for_url, rabbit_host => $::openstack_integration::config::ip_for_url,
database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8', database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8',

View File

@ -27,13 +27,13 @@ class openstack_integration::ceilometer {
class { '::ceilometer': class { '::ceilometer':
telemetry_secret => 'secrete', telemetry_secret => 'secrete',
metering_secret => 'secrete',
rabbit_userid => 'ceilometer', rabbit_userid => 'ceilometer',
rabbit_password => 'an_even_bigger_secret', rabbit_password => 'an_even_bigger_secret',
rabbit_host => $::openstack_integration::config::ip_for_url, rabbit_host => $::openstack_integration::config::ip_for_url,
rabbit_port => $::openstack_integration::config::rabbit_port, rabbit_port => $::openstack_integration::config::rabbit_port,
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
debug => true, debug => true,
verbose => true,
} }
class { '::ceilometer::db::mysql': class { '::ceilometer::db::mysql':
password => 'ceilometer', password => 'ceilometer',

View File

@ -55,7 +55,6 @@ class openstack_integration::cinder (
rabbit_userid => 'cinder', rabbit_userid => 'cinder',
rabbit_password => 'an_even_bigger_secret', rabbit_password => 'an_even_bigger_secret',
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
verbose => true,
debug => true, debug => true,
} }
class { '::cinder::api': class { '::cinder::api':

View File

@ -84,7 +84,6 @@ class openstack_integration::glance (
$glance_stores = concat($http_store, $backend_store) $glance_stores = concat($http_store, $backend_store)
class { '::glance::api': class { '::glance::api':
debug => true, debug => true,
verbose => true,
database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8', database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8',
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
workers => 2, workers => 2,
@ -102,7 +101,6 @@ class openstack_integration::glance (
} }
class { '::glance::registry': class { '::glance::registry':
debug => true, debug => true,
verbose => true,
database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8', database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8',
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
bind_host => $::openstack_integration::config::host, bind_host => $::openstack_integration::config::host,

View File

@ -16,7 +16,6 @@ class openstack_integration::gnocchi {
} }
class { '::gnocchi': class { '::gnocchi':
verbose => true,
debug => true, debug => true,
database_connection => 'mysql+pymysql://gnocchi:gnocchi@127.0.0.1/gnocchi?charset=utf8', database_connection => 'mysql+pymysql://gnocchi:gnocchi@127.0.0.1/gnocchi?charset=utf8',
} }

View File

@ -41,7 +41,6 @@ class openstack_integration::heat {
auth_uri => $::openstack_integration::config::keystone_admin_uri, auth_uri => $::openstack_integration::config::keystone_admin_uri,
keystone_password => 'a_big_secret', keystone_password => 'a_big_secret',
debug => true, debug => true,
verbose => true,
} }
class { '::heat::db::mysql': class { '::heat::db::mysql':
password => 'heat', password => 'heat',

View File

@ -36,7 +36,6 @@ class openstack_integration::ironic {
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8', database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8',
debug => true, debug => true,
verbose => true,
enabled_drivers => ['fake', 'pxe_ssh', 'pxe_ipmitool'], enabled_drivers => ['fake', 'pxe_ssh', 'pxe_ipmitool'],
} }
class { '::ironic::db::mysql': class { '::ironic::db::mysql':

View File

@ -44,7 +44,6 @@ class openstack_integration::keystone (
password => 'keystone', password => 'keystone',
} }
class { '::keystone': class { '::keystone':
verbose => true,
debug => true, debug => true,
database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone', database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone',
admin_token => 'admin_token', admin_token => 'admin_token',

View File

@ -38,7 +38,6 @@ class openstack_integration::mistral {
identity_uri => $::openstack_integration::config::keystone_admin_uri, identity_uri => $::openstack_integration::config::keystone_admin_uri,
auth_uri => "${::openstack_integration::config::keystone_auth_uri}/v3", auth_uri => "${::openstack_integration::config::keystone_auth_uri}/v3",
debug => true, debug => true,
verbose => true,
} }
class { '::mistral::keystone::auth': class { '::mistral::keystone::auth':
public_url => "${::openstack_integration::config::base_url}:8989/v2", public_url => "${::openstack_integration::config::base_url}:8989/v2",

View File

@ -56,7 +56,6 @@ class openstack_integration::nova (
rabbit_use_ssl => $::openstack_integration::config::ssl, rabbit_use_ssl => $::openstack_integration::config::ssl,
use_ipv6 => $::openstack_integration::config::ipv6, use_ipv6 => $::openstack_integration::config::ipv6,
glance_api_servers => "${::openstack_integration::config::base_url}:9292", glance_api_servers => "${::openstack_integration::config::base_url}:9292",
verbose => true,
debug => true, debug => true,
notification_driver => 'messagingv2', notification_driver => 'messagingv2',
notify_on_state_change => 'vm_and_task_state', notify_on_state_change => 'vm_and_task_state',

View File

@ -41,7 +41,6 @@ class openstack_integration::sahara {
admin_user => 'sahara', admin_user => 'sahara',
admin_tenant_name => 'services', admin_tenant_name => 'services',
debug => true, debug => true,
verbose => true,
auth_uri => "${::openstack_integration::config::keystone_admin_uri}/v2.0", auth_uri => "${::openstack_integration::config::keystone_admin_uri}/v2.0",
identity_uri => $::openstack_integration::config::keystone_admin_uri, identity_uri => $::openstack_integration::config::keystone_admin_uri,
} }

View File

@ -54,7 +54,6 @@ class openstack_integration::trove {
auth_uri => $::openstack_integration::config::keystone_auth_uri, auth_uri => $::openstack_integration::config::keystone_auth_uri,
identity_uri => $::openstack_integration::config::keystone_admin_uri, identity_uri => $::openstack_integration::config::keystone_admin_uri,
debug => true, debug => true,
verbose => true,
workers => 2, workers => 2,
cert_file => $crt_file, cert_file => $crt_file,
key_file => $key_file, key_file => $key_file,