Merge if/else branch into a single resource declaration

This always defined the same file, just with a different source. That source is either the provided server_ca_cert or the default CA.
theforeman · Oct 15, 2024 · bbeedaf · bbeedaf
1 parent 9824c7a
commit bbeedaf
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/manifests/ca.pp b/manifests/ca.pp
@@ -47,22 +47,12 @@
   }
 
   if $generate {
-    if $certs::server_ca_cert {
-      file { $server_ca_path:
-        ensure => file,
-        source => $certs::server_ca_cert,
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0644',
-      }
-    } else {
-      file { $server_ca_path:
-        ensure => file,
-        source => $default_ca_path,
-        owner  => 'root',
-        group  => 'root',
-        mode   => '0644',
-      }
+    file { $server_ca_path:
+      ensure => file,
+      source => pick($certs::server_ca_cert, $default_ca_path),
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0644',
     }
 
     file { "${certs::ssl_build_dir}/KATELLO-TRUSTED-SSL-CERT":