lib/cucumber/chef/containers.rb in cucumber-chef-2.1.0.rc.12 vs lib/cucumber/chef/containers.rb in cucumber-chef-2.1.0.rc.14
- old
+ new
@@ -87,11 +87,10 @@
:ip => generate_ip,
:mac => generate_mac,
:persist => true,
:distro => "ubuntu",
:release => "lucid",
- :arch => detect_arch(attributes[:distro] || "ubuntu")
- }.merge(attributes)
+ }.merge(attributes).merge(:arch => detect_arch(attributes[:distro] || "ubuntu"))
if running?(name)
@ui.logger.info { "Container '#{name}' is already running." }
else
@ui.logger.info { "Please wait, creating container {#{name.inspect} => #{tag(name)}}." }