Gnocchi: Drop redundant integration_enable
This parameter is redundant because we can use the backend parameter. Depends-on: https://review.opendev.org/892254 Change-Id: Ibc5e5cf36a73b0d7052592b96c0ec330a6d6ac57
This commit is contained in:
parent
bcf4ffab9b
commit
7c35c92a87
@ -84,8 +84,7 @@ class { 'openstack_integration::provision':
|
||||
image_format => 'raw',
|
||||
}
|
||||
class { 'openstack_integration::gnocchi':
|
||||
backend => 'ceph',
|
||||
integration_enable => true,
|
||||
backend => 'ceph',
|
||||
}
|
||||
|
||||
class { 'openstack_integration::tempest':
|
||||
|
@ -88,8 +88,7 @@ class { 'openstack_integration::ceilometer':
|
||||
}
|
||||
include openstack_integration::aodh
|
||||
class { 'openstack_integration::gnocchi':
|
||||
integration_enable => true,
|
||||
backend => 'swift',
|
||||
backend => 'swift',
|
||||
}
|
||||
|
||||
class { 'openstack_integration::tempest':
|
||||
|
@ -1,17 +1,11 @@
|
||||
# Configure the Gnocchi service
|
||||
#
|
||||
# [*backend*]
|
||||
# (optional) Backend storage to be used. This is overridden by 'file' when
|
||||
# integration_enable is false.
|
||||
# Defaults to 'ceph'.
|
||||
#
|
||||
# [*integration_enable*]
|
||||
# (optional) Boolean to run integration tests.
|
||||
# Defaults to true.
|
||||
# (optional) Backend storage to be used.
|
||||
# Defaults to 'file'.
|
||||
#
|
||||
class openstack_integration::gnocchi (
|
||||
$backend = 'ceph',
|
||||
$integration_enable = true,
|
||||
$backend = 'file',
|
||||
){
|
||||
|
||||
include openstack_integration::config
|
||||
@ -25,12 +19,6 @@ class openstack_integration::gnocchi (
|
||||
Exec['update-ca-certificates'] ~> Service['httpd']
|
||||
}
|
||||
|
||||
if ! $integration_enable {
|
||||
$backend_real = 'file'
|
||||
} else {
|
||||
$backend_real = $backend
|
||||
}
|
||||
|
||||
class { 'gnocchi::logging':
|
||||
debug => true,
|
||||
}
|
||||
@ -60,7 +48,7 @@ class openstack_integration::gnocchi (
|
||||
# cycle, caused by multiple usage of httpd. In the mean time
|
||||
# skip initializing storage for swift, because the current
|
||||
# implementation only validates connection to swift.
|
||||
$db_sync_extra_opts = $backend_real ? {
|
||||
$db_sync_extra_opts = $backend ? {
|
||||
'swift' => '--skip-storage',
|
||||
default => undef,
|
||||
}
|
||||
@ -111,7 +99,7 @@ class openstack_integration::gnocchi (
|
||||
}
|
||||
class { 'gnocchi::storage': }
|
||||
|
||||
case $backend_real {
|
||||
case $backend {
|
||||
'ceph': {
|
||||
class { 'gnocchi::storage::ceph':
|
||||
ceph_username => 'openstack',
|
||||
|
Loading…
Reference in New Issue
Block a user