Merge "Create only required ceph pools"

openstack/puppet-openstack-integration

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2023年08月07日 16:35:21 +00:00

committed by Gerrit Code Review

parent 7c3806a893 37f7f27145

commit a9785f17dd

3 changed files with 10 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

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'],

}

includeopenstack_integration::vitrage

includeopenstack_integration::ceph

class{ 'openstack_integration::ceph':

ceph_pools => ['glance', 'nova', 'cinder', 'gnocchi', 'backups']

}

class{ 'openstack_integration::heat':

notification_topics => ['notifications', 'vitrage_notifications'],

}

@@ -91,6 +93,7 @@ class { 'openstack_integration::provision':

image_format => 'raw',

}

class{ 'openstack_integration::gnocchi':

backend => 'ceph',

integration_enable => true,

}

1
fixtures/scenario004.pp

View File

@@ -65,6 +65,7 @@ class { 'openstack_integration::nova':

class{ 'openstack_integration::ceph':

deploy_rgw => true,

create_cephfs => true,

ceph_pools => ['glance', 'nova'],

}

class{ 'openstack_integration::horizon':

octavia_enabled => true

6
manifests/ceph.pp

View File

@@ -13,10 +13,15 @@

#(optional)FlagifCephFSwillbecreated.

#Defaultstofalse

#

#[*ceph_pools*]

#(optional)Cephpools

#Defaultsto['glance','nova']

#

classopenstack_integration::ceph(

$deploy_rgw=false,

$pg_num=16,

$create_cephfs=false,

$ceph_pools=['glance','nova']

){

include openstack_integration::config

@@ -136,7 +141,6 @@ test -b /dev/ceph_vg/lv_data

rbd_default_features=>'15',

}

$ceph_pools=['glance','nova','cinder','gnocchi','backups']

ceph::pool{ $ceph_pools:

pg_num => $pg_num,

}