/lib/foreman/model/libvirt.rb - Diff - Foreman

« Previous | Next »

Revision 557b8543

fixes #2317 - VM's with the name foreman_########

         end
         def vm_instance_defaults
+          {
           super.merge(
             :memory     => 768*1024*1024,
             :boot_order => %w[network hd],
             :nics       => [new_nic],
             :volumes    => [new_volume],
             :display    => { :type => 'vnc', :listen => Setting[:libvirt_default_console_address], :password => random_password, :port => '-1' }
+          }
+          )
         end
         def create_volumes args

Also available in: Unified diff