Merge "Revert "DRBD: Add hmac/secret param support""
This commit is contained in:
commit
3a81b45fb4
@ -8,9 +8,6 @@ class platform::drbd::params (
|
|||||||
$initial_setup = false,
|
$initial_setup = false,
|
||||||
$fs_type = 'ext4',
|
$fs_type = 'ext4',
|
||||||
$cpumask = false,
|
$cpumask = false,
|
||||||
$hmac = undef,
|
|
||||||
$secret = undef,
|
|
||||||
$secure = false,
|
|
||||||
) {
|
) {
|
||||||
include ::platform::params
|
include ::platform::params
|
||||||
$host1 = $::platform::params::controller_0_hostname
|
$host1 = $::platform::params::controller_0_hostname
|
||||||
@ -68,10 +65,7 @@ define platform::drbd::filesystem (
|
|||||||
} else {
|
} else {
|
||||||
$ip2 = $ip2_override
|
$ip2 = $ip2_override
|
||||||
}
|
}
|
||||||
if $::platform::drbd::params::secure == true {
|
|
||||||
$drbd_hmac = $::platform::drbd::params::hmac
|
|
||||||
$drbd_secret = $::platform::drbd::params::secret
|
|
||||||
}
|
|
||||||
if ($ensure == 'absent') {
|
if ($ensure == 'absent') {
|
||||||
exec { "umount drbd device ${device}":
|
exec { "umount drbd device ${device}":
|
||||||
command => "umount ${device}",
|
command => "umount ${device}",
|
||||||
@ -143,8 +137,6 @@ define platform::drbd::filesystem (
|
|||||||
rtt_ms => $::platform::drbd::params::rtt_ms,
|
rtt_ms => $::platform::drbd::params::rtt_ms,
|
||||||
cpumask => $::platform::drbd::params::cpumask,
|
cpumask => $::platform::drbd::params::cpumask,
|
||||||
resync_after => $resync_after,
|
resync_after => $resync_after,
|
||||||
hmac => $drbd_hmac,
|
|
||||||
secret => $drbd_secret,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user