Merge pull request #123 from derekhiggins/empty-opts

Allow an empty hash for options
voxpupuli · Oct 28, 2015 · 6015494 · 6015494
2 parents c8ade3f + 7d4cd7b
commit 6015494
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/puppet/provider/network_config/redhat.rb b/lib/puppet/provider/network_config/redhat.rb
@@ -168,7 +168,7 @@ def self.munge(pairs)
     end
 
     # For all of the remaining values, blindly toss them into the options hash.
-    props[:options] = pairs unless pairs.empty?
+    props[:options] = pairs
 
     [:onboot, :hotplug].each do |bool_property|
       if props[bool_property]

diff --git a/spec/fixtures/provider/network_config/redhat_spec/eth1-simple b/spec/fixtures/provider/network_config/redhat_spec/eth1-simple
@@ -0,0 +1,4 @@
+BOOTPROTO=dhcp
+ONBOOT=yes
+DEVICE=eth1
+HOTPLUG=yes
diff --git a/spec/unit/provider/network_config/redhat_spec.rb b/spec/unit/provider/network_config/redhat_spec.rb
@@ -94,6 +94,11 @@ def fixture_data(file)
       it { data[:options]["NM_CONTROLLED"].should == 'no' }
     end
 
+    describe 'with no extra options' do
+      let(:data) { described_class.parse_file('eth0', fixture_data('eth1-simple'))[0] }
+      it { data[:options].should == {} }
+    end
+
     describe 'complex configuration' do
       let(:virbonding_path) { File.join(PROJECT_ROOT, 'spec', 'fixtures', 'provider', 'network_config', 'redhat_spec', 'virbonding') }
 
@@ -199,7 +204,7 @@ def fixture_data(file)
         its(:netmask)   { should == '255.255.255.0' }
         its(:onboot)    { should == :absent }
         its(:method)    { should == 'static' }
-        its(:options)   { should == :absent }
+        its(:options)   { should == {} }
       end
 
       describe 'vlan200' do