openstack/puppet-openstack-integration
Code Issues Proposed changes

Create only required ceph pools

Browse Source 
... instead of creating all regardless of the enabled services and
backends.

Change-Id: Ifbb90e5ab70428c651b317fd0fbb5f67a1cd97b8
This commit is contained in:
Takashi Kajinami 2023-08-07 10:22:25 +09:00
parent 9ebab72d2e
commit 37f7f27145
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fixtures/scenario001.pp
View File

@ -81,7 +81,9 @@ class { 'openstack_integration::aodh':
notification_topics => ['notifications', 'vitrage_notifications'], notification_topics => ['notifications', 'vitrage_notifications'],
} }
include openstack_integration::vitrage include openstack_integration::vitrage
include openstack_integration::ceph class { 'openstack_integration::ceph':
ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
}
class { 'openstack_integration::heat': class { 'openstack_integration::heat':
notification_topics => ['notifications', 'vitrage_notifications'], notification_topics => ['notifications', 'vitrage_notifications'],
} }
@ -91,6 +93,7 @@ class { 'openstack_integration::provision':
image_format => 'raw', image_format => 'raw',
} }
class { 'openstack_integration::gnocchi': class { 'openstack_integration::gnocchi':
backend => 'ceph',
integration_enable => true, integration_enable => true,
} }

1
fixtures/scenario004.pp
View File

@ -65,6 +65,7 @@ class { 'openstack_integration::nova':
class { 'openstack_integration::ceph': class { 'openstack_integration::ceph':
deploy_rgw => true, deploy_rgw => true,
create_cephfs => true, create_cephfs => true,
ceph_pools => ['glance', 'nova'],
} }
class { 'openstack_integration::horizon': class { 'openstack_integration::horizon':
octavia_enabled => true octavia_enabled => true

6
manifests/ceph.pp
View File

@ -13,10 +13,15 @@
# (optional) Flag if CephFS will be created. # (optional) Flag if CephFS will be created.
# Defaults to false # Defaults to false
# #
# [*ceph_pools*]
# (optional) Ceph pools
# Defaults to ['glance', 'nova']
#
class openstack_integration::ceph ( class openstack_integration::ceph (
$deploy_rgw = false, $deploy_rgw = false,
$pg_num = 16, $pg_num = 16,
$create_cephfs = false, $create_cephfs = false,
$ceph_pools = ['glance', 'nova']
) { ) {
include openstack_integration::config include openstack_integration::config
@ -136,7 +141,6 @@ test -b /dev/ceph_vg/lv_data
rbd_default_features => '15', rbd_default_features => '15',
} }
$ceph_pools = ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
ceph::pool { $ceph_pools: ceph::pool { $ceph_pools:
pg_num => $pg_num, pg_num => $pg_num,
} }