From 4af944f9d658bc2e23bd30bc53dde7d45cdf7814 Mon Sep 17 00:00:00 2001 From: Darragh Bailey Date: Fri, 25 Nov 2016 16:07:55 +0000 Subject: [PATCH] Merge CDROM storage config blocks --- lib/vagrant-libvirt/config.rb | 3 +++ spec/unit/config_spec.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb index df6f640..30acc03 100644 --- a/lib/vagrant-libvirt/config.rb +++ b/lib/vagrant-libvirt/config.rb @@ -637,6 +637,9 @@ module VagrantPlugins c = disks.dup c += other.disks result.disks = c + c = cdroms.dup + c += other.cdroms + result.cdroms = c end end end diff --git a/spec/unit/config_spec.rb b/spec/unit/config_spec.rb index ce2287f..0fb97a2 100644 --- a/spec/unit/config_spec.rb +++ b/spec/unit/config_spec.rb @@ -87,7 +87,7 @@ describe VagrantPlugins::ProviderLibvirt::Config do context "with cdroms only" do context "assigned specific devs" do - xit "should merge disks with specific devices" do + it "should merge disks with specific devices" do one.storage(:file, :device => :cdrom, :dev => "hda") two.storage(:file, :device => :cdrom, :dev => "hdb") subject.finalize!