openstack/puppet-openstack-integration
Code Issues Proposed changes

Replace deprecated parameters in puppet-gnocchi

Browse Source 
Change-Id: Ia4ccea55ab5cc82ca43f149b9bc4f5dc984ccb09
This commit is contained in:
Takashi Kajinami 2020-05-20 21:25:46 +09:00
parent 5216d9ba52
commit bd5b4a52f1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/gnocchi.pp
View File

@ -22,9 +22,12 @@ class openstack_integration::gnocchi (
class { 'gnocchi::logging': class { 'gnocchi::logging':
debug => true, debug => true,
} }
class { 'gnocchi': class { 'gnocchi::db':
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',
} }
class { 'gnocchi':
coordination_url => $::openstack_integration::config::tooz_url,
}
class { 'gnocchi::db::mysql': class { 'gnocchi::db::mysql':
password => 'gnocchi', password => 'gnocchi',
} }
@ -57,21 +60,19 @@ class openstack_integration::gnocchi (
} }
class { 'gnocchi::client': } class { 'gnocchi::client': }
class { 'gnocchi::metricd': class { 'gnocchi::metricd':
workers => 2, workers => 2,
# because we configure Keystone to expire tokens after 600s, we don't # because we configure Keystone to expire tokens after 600s, we don't
# want to rely on default value in Gnocchi which is 300s to cleanup old data. # want to rely on default value in Gnocchi which is 300s to cleanup old data.
# Indeed, Gnocchi might use an old token that expired to clean up and then it would # Indeed, Gnocchi might use an old token that expired to clean up and then it would
# fail. It happens when running Tempest tests in the gate with low resources. # fail. It happens when running Tempest tests in the gate with low resources.
# Production value (300) shouldn't be changed by default. # Production value (300) shouldn't be changed by default.
cleanup_delay => 10, cleanup_delay => 10,
}
class { 'gnocchi::storage':
# NOTE(sileht): Since we set the pipeline interval to 1 minutes instead # NOTE(sileht): Since we set the pipeline interval to 1 minutes instead
# of 10, we must compute metrics more often too, otherwise Aodh alarms will # of 10, we must compute metrics more often too, otherwise Aodh alarms will
# always missed data just because they are 'not yet' computed. # always missed data just because they are 'not yet' computed.
metric_processing_delay => 5, metric_processing_delay => 5,
coordination_url => $::openstack_integration::config::tooz_url,
} }
class { 'gnocchi::storage': }
if $integration_enable { if $integration_enable {
class { 'gnocchi::storage::ceph': class { 'gnocchi::storage::ceph':
ceph_username => 'openstack', ceph_username => 'openstack',