(cluster/*ccs) rm disabling of sudo config purging

This is no longer necessary and is definitely not desirable.
lsst-it · Oct 16, 2023 · 50f6125 · 50f6125
1 parent 851da81
commit 50f6125
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/hieradata/cluster/auxtel-ccs.yaml b/hieradata/cluster/auxtel-ccs.yaml
@@ -17,8 +17,6 @@ postfix::configs:
     value: "hash:/etc/postfix/sasl_passwd"
   smtp_sasl_mechanism_filter:
     value: "plain, login"
-
-sudo::purge: false  # FIXME
 sudo::configs:
   auxtel_ccs_cmd:
     content: "%auxtel-ccs-cmd ALL=(ccs) NOPASSWD: ALL"

diff --git a/hieradata/cluster/comcam-ccs.yaml b/hieradata/cluster/comcam-ccs.yaml
@@ -20,7 +20,6 @@ postfix::configs:
     value: "hash:/etc/postfix/sasl_passwd"
   smtp_sasl_mechanism_filter:
     value: "plain, login"
-sudo::purge: false  # FIXME
 sudo::configs:
   comcam_ccs_cmd:
     content: "%comcam-ccs-cmd ALL=(ccs) NOPASSWD: ALL"

diff --git a/hieradata/cluster/lsstcam-ccs.yaml b/hieradata/cluster/lsstcam-ccs.yaml
@@ -16,7 +16,6 @@ postfix::configs:
     value: "hash:/etc/postfix/sasl_passwd"
   smtp_sasl_mechanism_filter:
     value: "plain, login"
-sudo::purge: false  # FIXME
 sudo::configs:
   lsstcam_ccs_cmd:
     content: "%lsstcam-ccs-cmd ALL=(ccs) NOPASSWD: ALL"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -384,6 +384,7 @@ def node_files
   end
 
   it { is_expected.to contain_class('systemd').with_manage_udevd(true) }
+  it { is_expected.to contain_class('sudo').with_purge(true) }
 end
 
 shared_examples 'lhn sysctls', :lhn_node do
-Original file line number
+Diff line change
@@ Expand Up / @@ -384,6 +384,7 @@ def node_files @@
       end
       it { is_expected.to contain_class('systemd').with_manage_udevd(true) }
+      it { is_expected.to contain_class('sudo').with_purge(true) }
     end
     shared_examples 'lhn sysctls', :lhn_node do
@@ Expand Down @@