starlingx
/
stx-puppet
Code Issues Proposed changes

Merge "Revert "DRBD: Add hmac/secret param support""

This commit is contained in:
Zuul 2024-06-20 11:42:13 +00:00 committed by Gerrit Code Review
parent 8cd1aee392 427979f0ca
commit 3a81b45fb4
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
puppet-manifests/src/modules/platform/manifests/drbd.pp
View File

@ -8,9 +8,6 @@ class platform::drbd::params (
$initial_setup = false,
$fs_type = 'ext4',
$cpumask = false,
$hmac = undef,
$secret = undef,
$secure = false,
) {
include ::platform::params
$host1 = $::platform::params::controller_0_hostname
@ -68,10 +65,7 @@ define platform::drbd::filesystem (
} else {
$ip2 = $ip2_override
}
if $::platform::drbd::params::secure == true {
$drbd_hmac = $::platform::drbd::params::hmac
$drbd_secret = $::platform::drbd::params::secret
}
if ($ensure == 'absent') {
exec { "umount drbd device ${device}":
command => "umount ${device}",
@ -143,8 +137,6 @@ define platform::drbd::filesystem (
rtt_ms => $::platform::drbd::params::rtt_ms,
cpumask => $::platform::drbd::params::cpumask,
resync_after => $resync_after,
hmac => $drbd_hmac,
secret => $drbd_secret,
}
}
}