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 9e4cd7852e7dd321e42dcd77a0664362120030d7)
(cherry picked from commit e9ca68508f55fd7cbe24ecbba1bc5439ed74ecfc)
(cherry picked from commit c3bb6192dc84993225bf8f2bb2fda062202dbc83)
This commit is contained in:
Takashi Kajinami 2024-10-14 13:30:00 +09:00
parent c7cf1a9c93
commit 079c55c99a
4 changed files with 5 additions and 5 deletions

4
manifests/cinder.pp

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

2
manifests/glance.pp

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

2
manifests/gnocchi.pp

@ -107,7 +107,7 @@ class openstack_integration::gnocchi (
manage_rados => true, manage_rados => true,
} }
# make sure ceph pool exists before running gnocchi (dbsync & services) # 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': { 'swift': {
class { 'gnocchi::storage::swift': class { 'gnocchi::storage::swift':

2
manifests/nova.pp

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