openstack/puppet-swift
Code Issues Proposed changes

Use ensure_resource to declare rsync::server

Browse Source 
... instead of skipping the 2nd declaration, to detect conflicting
definitions.

Change-Id: I7370f740da55bc7128fbef21599907365c49cd93
This commit is contained in:
Takashi Kajinami
2024-01-10 15:13:09 +09:00
parent 0e3f254347
commit 64b7667b86
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/ringserver.pp
View File

@@ -42,13 +42,11 @@ class swift::ringserver(
fail('xinetd is not available in this distro') fail('xinetd is not available in this distro')
} }
if !defined(Class['rsync::server']) { ensure_resource('class', 'rsync::server', {
class { 'rsync::server': 'use_xinetd' => $rsync_use_xinetd,
use_xinetd => $rsync_use_xinetd, 'address' => $local_net_ip,
address => $local_net_ip, 'use_chroot' => 'no',
use_chroot => 'no', })
}
}
rsync::server::module { 'swift_server': rsync::server::module { 'swift_server':
path => '/etc/swift', path => '/etc/swift',

12
manifests/storage.pp
View File

@@ -35,11 +35,9 @@ class swift::storage(
fail('xinetd is not available in this distro') fail('xinetd is not available in this distro')
} }
if !defined(Class['rsync::server']){ ensure_resource('class', 'rsync::server', {
class{ 'rsync::server': 'use_xinetd' => $rsync_use_xinetd,
use_xinetd => $rsync_use_xinetd, 'address' => $storage_local_net_ip,
address => $storage_local_net_ip, 'use_chroot' => 'no',
use_chroot => 'no', })
}
}
} }