lib/beaker/hypervisor/blimper.rb in beaker-1.8.1 vs lib/beaker/hypervisor/blimper.rb in beaker-1.8.2
- old
+ new
@@ -25,19 +25,19 @@
end
def initialize(blimpy_hosts, options)
@options = options
@logger = options[:logger]
- @blimpy_hosts = blimpy_hosts
+ @hosts = blimpy_hosts
@blimpy = Blimpy
end
def provision
ami_spec= YAML.load_file(@options[:ec2_yaml])["AMI"]
fleet = @blimpy.fleet do |fleet|
- @blimpy_hosts.each do |host|
+ @hosts.each do |host|
amitype = host['vmname'] || host['platform']
amisize = host['amisize'] || 'm1.small'
#use snapshot provided for this host
image_type = host['snapshot']
if not image_type
@@ -88,27 +88,27 @@
# Also generate hosts entries for the fleet, since we're iterating
etc_hosts = "127.0.0.1\tlocalhost localhost.localdomain\n"
fleet.ships.each do |ship|
ship.wait_for_sshd
name = ship.name
- host = @blimpy_hosts.select { |host| host.name == name }[0]
+ host = @hosts.select { |host| host.name == name }[0]
host['ip'] = ship.dns
host.exec(Command.new("hostname #{name}"))
ip = get_ip(host)
domain = get_domain_name(host)
etc_hosts += "#{ip}\t#{name}\t#{name}.#{domain}\n"
end
# Send our hosts information to the nodes
- @blimpy_hosts.each do |host|
+ @hosts.each do |host|
set_etc_hosts(host, etc_hosts)
end
end #revert_blimpy
def cleanup
fleet = @blimpy.fleet do |fleet|
- @blimpy_hosts.each do |host|
+ @hosts.each do |host|
fleet.add(:aws) do |ship|
ship.name = host.name
end
end
end