Merge "Use ensure_resource to declare rsync::server"
This commit is contained in:
commit
b5a4ab89e8
|
@ -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',
|
||||||
|
|
|
@ -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',
|
})
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue