mod:hpc_apt: make APT foreign arch optional

When $::hpc_apt::foreign_arch is not defined, the module should not try to run the dpkg command (without argument).
edf-hpc · Feb 14, 2017 · a0d53da · a0d53da
1 parent 6c24b8b
commit a0d53da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/puppet-config/modules/hpc_apt/manifests/config.pp b/puppet-config/modules/hpc_apt/manifests/config.pp
@@ -16,9 +16,11 @@
 #
 class hpc_apt::config inherits hpc_apt {
 
-  exec { 'add_foreign_arch':
-    command => "/usr/bin/dpkg --add-architecture ${::hpc_apt::foreign_arch}",
-    unless  => "/usr/bin/dpkg --print-foreign-architectures | grep ${::hpc_apt::foreign_arch}",
+  if $::hpc_apt::foreign_arch {
+    exec { 'add_foreign_arch':
+      command => "/usr/bin/dpkg --add-architecture ${::hpc_apt::foreign_arch}",
+      unless  => "/usr/bin/dpkg --print-foreign-architectures | grep ${::hpc_apt::foreign_arch}",
+    }
   }
 
   create_resources(apt::conf, $::hpc_apt::confs)

diff --git a/puppet-config/modules/hpc_apt/manifests/init.pp b/puppet-config/modules/hpc_apt/manifests/init.pp
@@ -24,7 +24,7 @@
 class hpc_apt (
   $confs        = {},
   $sources      = {},
-  $foreign_arch = '',
+  $foreign_arch = undef,
 ) {
   include ::apt