Merge ac6654f into 85dafc4

voxpupuli · Feb 5, 2019 · e10b228 · e10b228
2 parents 85dafc4 + ac6654f
commit e10b228
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/puppet/provider/network_config/interfaces.rb b/lib/puppet/provider/network_config/interfaces.rb
@@ -178,7 +178,9 @@ def self.parse_file(_filename, contents)
 
           # If an iface block for this interface has been seen, the file is
           # malformed.
-          raise_malformed if Instance[name] && Instance[name].family
+          unless ((family == 'inet' && Instance[name].family == 'inet6') or (family == 'inet6' && Instance[name].family == 'inet'))
+            raise_malformed if Instance[name] && Instance[name].family
+          end
 
           status = :iface
           current_interface = name