openstack
/
puppet-swift
Code Issues Proposed changes

Merge "Use ensure_resource to declare rsync::server"

This commit is contained in:
Zuul 2024-01-12 17:42:41 +00:00 committed by Gerrit Code Review
parent 26270f6a3e 64b7667b86
commit b5a4ab89e8
2 changed files with 10 additions and 14 deletions
Show Stats 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')
}
if !defined(Class['rsync::server']) {
class { 'rsync::server':
use_xinetd => $rsync_use_xinetd,
address => $local_net_ip,
use_chroot => 'no',
}
}
ensure_resource('class', 'rsync::server', {
'use_xinetd' => $rsync_use_xinetd,
'address' => $local_net_ip,
'use_chroot' => 'no',
})
rsync::server::module { 'swift_server':
path => '/etc/swift',

12
manifests/storage.pp
View File

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