Merge pull request #725 from seriv/main

Make it possible to use pod's network

Author: adrianiurca

lib/puppet/parser/functions/docker_run_flags.rb

@@ -22,10 +22,12 @@ module Puppet::Parser::Functions
       flags << "--restart '#{opts['restart']}'"
     end
 
-    if opts['net'].is_a? String
-      flags << "--net #{opts['net'].shellescape}"
-    elsif opts['net'].is_a? Array
-      flags << "--net #{opts['net'].join(' --net ').shellescape}"
+    if opts['net']
+      if opts['net'].is_a? String
+        flags << "--net #{opts['net'].shellescape}"
+      elsif opts['net'].is_a? Array
+        flags << "--net #{opts['net'].join(' --net ').shellescape}"
+      end
     end
 
     if opts['memory_limit']

manifests/run.pp

@@ -204,7 +204,7 @@
   Optional[Boolean]                       $use_name                          = false,
   Optional[Boolean]                       $running                           = true,
   Optional[Variant[String,Array]]         $volumes_from                      = [],
-  Variant[String,Array]                   $net                               = 'bridge',
+  Variant[String,Array,Undef]             $net                               = undef,
   Variant[String,Boolean]                 $username                          = false,
   Variant[String,Boolean]                 $hostname                          = false,
   Optional[Variant[String,Array]]         $env                               = [],