lib/beaker/hypervisor/solaris.rb in beaker-1.8.1 vs lib/beaker/hypervisor/solaris.rb in beaker-1.8.2

- old
+ new

@@ -2,11 +2,11 @@ class Solaris < Beaker::Hypervisor def initialize(solaris_hosts, options) @options = options @logger = options[:logger] - @solaris_hosts = solaris_hosts + @hosts = solaris_hosts @fog_file = nil if File.exists?( @options[:dot_fog] ) @fog_file = YAML.load_file( @options[:dot_fog] ) end raise "Cant load #{@options[:dot_fog]} config" unless @fog_file @@ -26,10 +26,10 @@ @logger.notify "Connecting to hypervisor at #{hypername}" hypervisor = Beaker::Host.create( hypername, hyperopts ) hypervisor[:user] = @fog_file[:default][:solaris_hypervisor_username] || hypervisor[:user] hypervisor[:ssh][:keys] = [@fog_file[:default][:solaris_hypervisor_keyfile]] || hypervisor[:ssh][:keys] - @solaris_hosts.each do |host| + @hosts.each do |host| vm_name = host['vmname'] || host.name #use the snapshot provided for this host snapshot = host['snapshot'] @logger.notify "Reverting #{vm_name} to snapshot #{snapshot}"