From 6bcc7756fc7eeff4f32e795165c0008e1fdb258c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 15 May 2016 23:30:50 +0200 Subject: [PATCH] Drop usage of deprecated verbose option Change-Id: Ia4ba77e4ea6e2afe591772cb33cd4ca0080ef6a6 --- manifests/aodh.pp | 1 - manifests/ceilometer.pp | 2 +- manifests/cinder.pp | 1 - manifests/glance.pp | 2 -- manifests/gnocchi.pp | 1 - manifests/heat.pp | 1 - manifests/ironic.pp | 1 - manifests/keystone.pp | 1 - manifests/mistral.pp | 1 - manifests/nova.pp | 1 - manifests/sahara.pp | 1 - manifests/trove.pp | 1 - 12 files changed, 1 insertion(+), 13 deletions(-) diff --git a/manifests/aodh.pp b/manifests/aodh.pp index 066bce9da..b5ca990c1 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -40,7 +40,6 @@ class openstack_integration::aodh { rabbit_password => 'an_even_bigger_secret', rabbit_port => $::openstack_integration::config::rabbit_port, rabbit_use_ssl => $::openstack_integration::config::ssl, - verbose => true, debug => true, rabbit_host => $::openstack_integration::config::ip_for_url, database_connection => 'mysql+pymysql://aodh:aodh@127.0.0.1/aodh?charset=utf8', diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index 7031f4497..a67ca6d0f 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -27,13 +27,13 @@ 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, rabbit_port => $::openstack_integration::config::rabbit_port, rabbit_use_ssl => $::openstack_integration::config::ssl, debug => true, - verbose => true, } class { '::ceilometer::db::mysql': password => 'ceilometer', diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 7d8752a7c..98a2acffa 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -55,7 +55,6 @@ class openstack_integration::cinder ( rabbit_userid => 'cinder', rabbit_password => 'an_even_bigger_secret', rabbit_use_ssl => $::openstack_integration::config::ssl, - verbose => true, debug => true, } class { '::cinder::api': diff --git a/manifests/glance.pp b/manifests/glance.pp index 8dd5d15b8..296383af1 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -84,7 +84,6 @@ class openstack_integration::glance ( $glance_stores = concat($http_store, $backend_store) class { '::glance::api': debug => true, - verbose => true, database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8', keystone_password => 'a_big_secret', workers => 2, @@ -102,7 +101,6 @@ class openstack_integration::glance ( } class { '::glance::registry': debug => true, - verbose => true, database_connection => 'mysql+pymysql://glance:glance@127.0.0.1/glance?charset=utf8', keystone_password => 'a_big_secret', bind_host => $::openstack_integration::config::host, diff --git a/manifests/gnocchi.pp b/manifests/gnocchi.pp index 74b41030b..6ba4df37a 100644 --- a/manifests/gnocchi.pp +++ b/manifests/gnocchi.pp @@ -16,7 +16,6 @@ class openstack_integration::gnocchi { } class { '::gnocchi': - verbose => true, debug => true, database_connection => 'mysql+pymysql://gnocchi:gnocchi@127.0.0.1/gnocchi?charset=utf8', } diff --git a/manifests/heat.pp b/manifests/heat.pp index 085666348..1222a4f29 100644 --- a/manifests/heat.pp +++ b/manifests/heat.pp @@ -41,7 +41,6 @@ class openstack_integration::heat { auth_uri => $::openstack_integration::config::keystone_admin_uri, keystone_password => 'a_big_secret', debug => true, - verbose => true, } class { '::heat::db::mysql': password => 'heat', diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 5a9250280..bcbc1a1e8 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -36,7 +36,6 @@ class openstack_integration::ironic { rabbit_use_ssl => $::openstack_integration::config::ssl, database_connection => 'mysql+pymysql://ironic:ironic@127.0.0.1/ironic?charset=utf8', debug => true, - verbose => true, enabled_drivers => ['fake', 'pxe_ssh', 'pxe_ipmitool'], } class { '::ironic::db::mysql': diff --git a/manifests/keystone.pp b/manifests/keystone.pp index 4a4164ba2..fb7eb70fc 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -44,7 +44,6 @@ class openstack_integration::keystone ( password => 'keystone', } class { '::keystone': - verbose => true, debug => true, database_connection => 'mysql+pymysql://keystone:keystone@127.0.0.1/keystone', admin_token => 'admin_token', diff --git a/manifests/mistral.pp b/manifests/mistral.pp index 01388be48..a1c28b86e 100644 --- a/manifests/mistral.pp +++ b/manifests/mistral.pp @@ -38,7 +38,6 @@ class openstack_integration::mistral { identity_uri => $::openstack_integration::config::keystone_admin_uri, auth_uri => "${::openstack_integration::config::keystone_auth_uri}/v3", debug => true, - verbose => true, } class { '::mistral::keystone::auth': public_url => "${::openstack_integration::config::base_url}:8989/v2", diff --git a/manifests/nova.pp b/manifests/nova.pp index 79c16c56a..b114a8bf1 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -56,7 +56,6 @@ class openstack_integration::nova ( rabbit_use_ssl => $::openstack_integration::config::ssl, use_ipv6 => $::openstack_integration::config::ipv6, glance_api_servers => "${::openstack_integration::config::base_url}:9292", - verbose => true, debug => true, notification_driver => 'messagingv2', notify_on_state_change => 'vm_and_task_state', diff --git a/manifests/sahara.pp b/manifests/sahara.pp index a9a4c6ad3..2c61509e1 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -41,7 +41,6 @@ class openstack_integration::sahara { admin_user => 'sahara', admin_tenant_name => 'services', debug => true, - verbose => true, auth_uri => "${::openstack_integration::config::keystone_admin_uri}/v2.0", identity_uri => $::openstack_integration::config::keystone_admin_uri, } diff --git a/manifests/trove.pp b/manifests/trove.pp index 381fd313a..833d8f5b9 100644 --- a/manifests/trove.pp +++ b/manifests/trove.pp @@ -54,7 +54,6 @@ class openstack_integration::trove { auth_uri => $::openstack_integration::config::keystone_auth_uri, identity_uri => $::openstack_integration::config::keystone_admin_uri, debug => true, - verbose => true, workers => 2, cert_file => $crt_file, key_file => $key_file,