openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Test ceph volume backup driver"

Browse Source
This commit is contained in:
Zuul 2023-07-31 19:41:23 +00:00 committed by Gerrit Code Review
commit bf8166c77f
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -57,7 +57,7 @@ scenario](#all-in-one).
| ceilometer | X | X | | | | | | ceilometer | X | X | | | | |
| aodh | X | X | | | | | | aodh | X | X | | | | |
| designate | | | bind | | | | | designate | | | bind | | | |
| backup | | swift | | | | | | backup | ceph | swift | | | | |
| gnocchi | rbd | swift | | | | | | gnocchi | rbd | swift | | | | |
| ec2api | | X | | | | | | ec2api | | X | | | | |
| heat | X | | X | | | | | heat | X | | X | | | |

2
fixtures/scenario001.pp
View File

@ -74,6 +74,7 @@ class { 'openstack_integration::nova':
} }
class { 'openstack_integration::cinder': class { 'openstack_integration::cinder':
backend => 'rbd', backend => 'rbd',
cinder_backup => 'ceph',
} }
include openstack_integration::ceilometer include openstack_integration::ceilometer
class { 'openstack_integration::aodh': class { 'openstack_integration::aodh':
@ -95,6 +96,7 @@ class { 'openstack_integration::gnocchi':
class { 'openstack_integration::tempest': class { 'openstack_integration::tempest':
cinder => true, cinder => true,
cinder_backup => true,
gnocchi => true, gnocchi => true,
ceilometer => true, ceilometer => true,
aodh => true, aodh => true,

4
manifests/ceph.pp
View File

@ -91,7 +91,7 @@ test -b /dev/ceph_vg/lv_data
'secret' => 'AQD7kyJQQGoOBhAAqrPAqSopSwPrrfMMomzVdw==', 'secret' => 'AQD7kyJQQGoOBhAAqrPAqSopSwPrrfMMomzVdw==',
'mode' => '0644', 'mode' => '0644',
'cap_mon' => 'profile rbd', 'cap_mon' => 'profile rbd',
'cap_osd' => 'profile rbd pool=cinder, profile rbd pool=nova, profile rbd pool=glance, profile rbd pool=gnocchi', 'cap_osd' => 'profile rbd pool=cinder, profile rbd pool=nova, profile rbd pool=glance, profile rbd pool=gnocchi, profile rbd pool=backups',
}, },
'client.manila' => { 'client.manila' => {
'secret' => 'AQD7kyJQQGoOBhAAqrPAqSopSwPrrfMMomzVdw==', 'secret' => 'AQD7kyJQQGoOBhAAqrPAqSopSwPrrfMMomzVdw==',
@ -111,7 +111,7 @@ test -b /dev/ceph_vg/lv_data
rbd_default_features => '15', rbd_default_features => '15',
} }
$ceph_pools = ['glance', 'nova', 'cinder', 'gnocchi'] $ceph_pools = ['glance', 'nova', 'cinder', 'gnocchi', 'backups']
ceph::pool { $ceph_pools: ceph::pool { $ceph_pools:
pg_num => $pg_num, pg_num => $pg_num,
} }

22
manifests/cinder.pp
View File

@ -11,8 +11,8 @@
# #
# [*cinder_backup*] # [*cinder_backup*]
# (optional) Set type of cinder backup # (optional) Set type of cinder backup
# Possible values: false, swift # Possible values: undef, swift, ceph
# defaults to false. # defaults to undef
# #
# [*notification_topics*] # [*notification_topics*]
# (optional) AMQP topic used for OpenStack notifications # (optional) AMQP topic used for OpenStack notifications
@ -21,7 +21,7 @@
class openstack_integration::cinder ( class openstack_integration::cinder (
$backend = 'iscsi', $backend = 'iscsi',
$volume_encryption = false, $volume_encryption = false,
$cinder_backup = false, $cinder_backup = undef,
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
) { ) {
@ -162,8 +162,7 @@ class openstack_integration::cinder (
rbd_secret_uuid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c', rbd_secret_uuid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c',
manage_volume_type => true, manage_volume_type => true,
} }
# make sure ceph pool exists before running Cinder API & Volume # make sure ceph pool exists before running Cinder Volume
Exec['create-cinder'] -> Service['httpd']
Exec['create-cinder'] -> Service['cinder-volume'] Exec['create-cinder'] -> Service['cinder-volume']
} }
default: { default: {
@ -174,8 +173,17 @@ class openstack_integration::cinder (
enabled_backends => ['BACKEND_1'], enabled_backends => ['BACKEND_1'],
} }
if $cinder_backup == swift { case $cinder_backup {
'swift': {
class { 'cinder::backup::swift': } class { 'cinder::backup::swift': }
} }
'ceph': {
class { 'cinder::backup::ceph':
backup_ceph_user => 'openstack',
}
# make sure ceph pool exists before running Cinder Backup
Exec['create-backups'] -> Service['cinder-backup']
}
default: {}
}
} }