From 427979f0cac91a077b85dded990acae47c359511 Mon Sep 17 00:00:00 2001 From: Luiz Felipe Kina Date: Thu, 20 Jun 2024 11:04:41 +0000 Subject: [PATCH] Revert "DRBD: Add hmac/secret param support" This reverts commit 7e2477beca1c2bfda7caebb5105fc19ee68bd628. Reason for revert: Blocking sanity test due to missing parameter. Change-Id: I0b6ca886dc2934c45ce2b7a9791c3652f03cc6d3 --- .../src/modules/platform/manifests/drbd.pp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/puppet-manifests/src/modules/platform/manifests/drbd.pp b/puppet-manifests/src/modules/platform/manifests/drbd.pp index 3ad337294..c5669686a 100644 --- a/puppet-manifests/src/modules/platform/manifests/drbd.pp +++ b/puppet-manifests/src/modules/platform/manifests/drbd.pp @@ -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, } } }