openstack/puppet-openstack-integration
Code Issues Proposed changes

Avoid using internal exec resources for dependencies

Browse Source 
... so that we can refactor resources in ceph::pool.

Change-Id: I98c66422b92a5a1b64ab90f646713f60b175645e
(cherry picked from commit 9e4cd7852e)
(cherry picked from commit e9ca68508f)
This commit is contained in:
Takashi Kajinami 2024-10-14 13:30:00 +09:00
parent f76e8cd88d
commit c3bb6192dc
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cinder.pp
View File

@ -160,7 +160,7 @@ class openstack_integration::cinder (
manage_volume_type => true,
}
# make sure ceph pool exists before running Cinder Volume
Exec['create-cinder'] -> Service['cinder-volume']
Ceph::Pool['cinder'] -> Service['cinder-volume']
}
default: {
fail("Unsupported backend (${backend})")
@ -179,7 +179,7 @@ class openstack_integration::cinder (
backup_ceph_user => 'openstack',
}
# make sure ceph pool exists before running Cinder Backup
Exec['create-backups'] -> Service['cinder-backup']
Ceph::Pool['backups'] -> Service['cinder-backup']
}
default: {}
}

2
manifests/glance.pp
View File

@ -69,7 +69,7 @@ class openstack_integration::glance (
rbd_store_pool => 'glance',
}
# make sure ceph pool exists before running Glance API
Exec['create-glance'] -> Service['glance-api']
Ceph::Pool['glance'] -> Service['glance-api']
$default_backend = 'rbd1'
}
'swift': {

2
manifests/gnocchi.pp
View File

@ -108,7 +108,7 @@ class openstack_integration::gnocchi (
manage_rados => true,
}
# make sure ceph pool exists before running gnocchi (dbsync & services)
Exec['create-gnocchi'] -> Exec['gnocchi-db-sync']
Ceph::Pool['gnocchi'] -> Anchor['gnocchi::dbsync::begin']
}
'swift': {
class { 'gnocchi::storage::swift':

2
manifests/nova.pp
View File

@ -261,7 +261,7 @@ class openstack_integration::nova (
manage_ceph_client => false,
}
# make sure ceph pool exists before running nova-compute
Exec['create-nova'] -> Service['nova-compute']
Ceph::Pool['nova'] -> Service['nova-compute']
} else {
include openstacklib::iscsid
Service['iscsid'] -> Service['nova-compute']