openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Avoid using internal exec resources for dependencies"

Browse Source
This commit is contained in:
Zuul 2024-10-14 15:33:35 +00:00 committed by Gerrit Code Review
commit 25c9442de0
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

@ -162,7 +162,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})")
@ -191,7 +191,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
View File

@ -70,7 +70,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
View File

@ -108,7 +108,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
View File

@ -265,7 +265,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']