Skip to content

Commit

Permalink
Added volume handling from cluster file, cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon committed Mar 12, 2013
1 parent a0072e0 commit b8c6d8b
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 91 deletions.
57 changes: 40 additions & 17 deletions lib/ironfan/dsl/vsphere.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,23 @@ def vsphere(*attrs,&block)
end

class Vsphere < Cloud
magic :provider, Whatever, :default => Ironfan::Provider::Vsphere
magic :vsphere_datacenters, Array, :default => ['New Datacenter']
magic :default_datacenter, String, :default => ->{ vsphere_datacenters.first }
magic :backing, String, :default => ''
magic :bits, Integer, :default => "64"
magic :bootstrap_distro, String, :default => 'ubuntu12.04-gems'
magic :chef_client_script, String
magic :cpus, String, :default => "1"
magic :datacenter, String, :default => ->{ default_datacenter }
magic :datastore, String
magic :template, String
magic :default_datacenter, String, :default => ->{ vsphere_datacenters.first }
magic :image_name, String
magic :bits, Integer, :default => "64"
magic :ssh_user, String, :default => "root"
# magic :ssh_user, String, :default => ->{ image_info[:ssh_user] }
magic :memory, String, :default => "4" # Gigabytes
magic :provider, Whatever, :default => Ironfan::Provider::Vsphere
magic :ssh_identity_dir, String, :default => ->{ Chef::Config.vsphere_key_dir }
magic :bootstrap_distro, String, :default => 'ubuntu12.04-gems'
magic :ssh_user, String, :default => "root"
magic :template, String
magic :validation_key, String, :default => ->{ IO.read(Chef::Config.validation_key) rescue '' }
magic :cpus, String, :default => "1"
magic :memory, String, :default => "4" # Gigabytes
magic :chef_client_script, String
magic :virtual_disks, Array, :default => []
magic :vsphere_datacenters, Array, :default => ['New Datacenter']

def image_info
bit_str = "#{self.bits.to_i}-bit" # correct for legacy image info.
Expand All @@ -35,8 +36,30 @@ def image_info
end

def implied_volumes
results = []
return results
result = []
# FIXME : This is really making assumptions
result << Ironfan::Dsl::Volume.new(:name => 'root') do
device '/dev/sda1'
fstype 'ext4'
keep false
mount_point '/'
end
return result unless virtual_disks.length > 0

virtual_disks.each_with_index do |vd, idx|
dev, mnt = ["/dev/sd%s" %[(66 + idx).chr.downcase], idx == 0 ? "/mnt" : "/mnt#{idx}"] # WHAAAaaa 0 o ???
virtualdisk = Ironfan::Dsl::Volume.new(:name => "virtualdisk#{idx}") do
attachable "VirtualDisk"
fstype vd[:fs]
device dev
mount_point vd[:mount_point] || mnt
formattable true
create_at_launch true
mount_options 'defaults,noatime'
end
result << virtualdisk
end
result
end

def ssh_identity_file(computer)
Expand All @@ -47,19 +70,19 @@ def ssh_identity_file(computer)
def to_display(style,values={})
return values if style == :minimal

# values["Flavor"] = flavor
values["Datacenter"] = datacenter
return values if style == :default

values
end

end
end
end

Chef::Config[:vsphere_vm_info] ||= {}
Chef::Config[:vsphere_vm_info].merge!({
#Chef::Config[:vsphere_vm_info] ||= {}
#Chef::Config[:vsphere_vm_info].merge!({
#
# Presice (Ubuntu 12.04)
#
%w["New Datacenter" 64-bit presice] => { :template_name => 'Ubuntu 12.04 Template2', :ssh_user => 'root', :bootstrap_distro => "ubuntu10.04-gems", }})
# %w["New Datacenter" 64-bit presice] => { :template_name => 'Ubuntu 12.04 Template2', :ssh_user => 'root', :bootstrap_distro => "ubuntu10.04-gems", }})
2 changes: 0 additions & 2 deletions lib/ironfan/provider/vsphere.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ def self.get_pub_key(cluster)
puts Keypair.private_key
end


private
def self.vsphere_credentials
return {
Expand All @@ -73,4 +72,3 @@ def self.vsphere_credentials
end
end
end

122 changes: 50 additions & 72 deletions lib/ironfan/provider/vsphere/machine.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ def public_ip_address
# FIXME
return adaptee.guest.ipAddress
end

def private_ip_address
return adaptee.guest.ipAddress
end

def public_hostname
# FIXME
Expand Down Expand Up @@ -73,8 +77,8 @@ def stop
adaptee.PowerOffVM_Task.wait_for_completion
end

def self.generate_clone_spec(src_config, dc, cpus, memory, datastore)
#dc = Vsphere.find_dc(vsphere_dc)
def self.generate_clone_spec(src_config, dc, cpus, memory, datastore, virtual_disks)
# TODO : A lot of this should be moved to utilities in providers/vsphere.rb
rspec = Vsphere.get_rspec(dc)
rspec.datastore = datastore

Expand All @@ -85,9 +89,9 @@ def self.generate_clone_spec(src_config, dc, cpus, memory, datastore)
card = src_config.hardware.device.find { |d| d.deviceInfo.label == "Network adapter 1" }
begin
switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
:switchUuid => network.config.distributedVirtualSwitch.uuid,
:portgroupKey => network.key )

:switchUuid => network.config.distributedVirtualSwitch.uuid,
:portgroupKey => network.key
)
card.backing.port = switch_port
rescue
card.backing.deviceName = network.name
Expand All @@ -96,53 +100,36 @@ def self.generate_clone_spec(src_config, dc, cpus, memory, datastore)
network_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
clone_spec.config.deviceChange.push network_spec

disk = RbVmomi::VIM.VirtualDisk(
:key => 2001,
:capacityInKB => 40000000,
:controllerKey => 1000,
:unitNumber => 2,
:backing => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
:fileName => "[#{datastore.name}]",
:diskMode => :persistent,
:thinProvisioned => true,
:datastore => datastore
),
:deviceInfo => RbVmomi::VIM.Description(
:label => "Hard disk 2",
:summary => "4GB"
),
)

# disk = src_config.hardware.device.find { |d| d.class == RbVmomi::VIM::VirtualDisk }
# disk.capacityInKB=40000000
disk_spec = {:operation => :add, :fileOperation => :create, :device => disk }
# disk_spec = {:operation=>:edit, :device=> disk }
# disk_spec = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => [RbVmomi::VIM.VirtualDeviceConfigSpec(disk_spec)])
clone_spec.config.deviceChange.push disk_spec


# disk = #{
# RbVmomi::VIM.VirtualDisk(
# :key => 2001,
# :backing => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
# :fileName => '[datastore1]',
# :diskMode => :persistent,
# :thinProvisioned => true
# ),
# :controllerKey => 1000,
# :unitNumber => 0,
# :capacityInKB => 4000000
# )
# }

# disk_specs = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => disk, :operation => "add", :fileOperation => :create)
# clone_spec.config.deviceChange.push disk_specs
virtual_disks.each_with_index do |vd, idx|
size = vd[:size].to_i
label = vd[:label].to_i
key = 2001 + idx # key 2000 -> SCSI0, 2001 -> SCSI1...

disk = RbVmomi::VIM.VirtualDisk(
:key => key,
:capacityInKB => size * 1024 * 1024,
:controllerKey => 1000, # SCSI controller
:unitNumber => idx + 1,
:backing => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
:fileName => "[#{datastore.name}] ",
:diskMode => :persistent,
:thinProvisioned => true,
:datastore => datastore
),
:deviceInfo => RbVmomi::VIM.Description(
:label => label,
:summary => "%sGB" %[size]
),
)

disk_spec = {:operation => :add, :fileOperation => :create, :device => disk }
clone_spec.config.deviceChange.push disk_spec
end

clone_spec.config.numCPUs = Integer(cpus)
clone_spec.config.numCPUs = Integer(cpus)
clone_spec.config.memoryMB = Integer(memory) * 1024

clone_spec

end

def self.create!(computer)
Expand All @@ -155,24 +142,24 @@ def self.create!(computer)

# TODO: Pass launch_desc to a single function and let it do the rest... like fog does
launch_desc = launch_description(computer)
datacenter = launch_desc[:datacenter]
datastore = launch_desc[:datastore]
user_data = launch_desc[:user_data]
template = launch_desc[:template]
memory = launch_desc[:memory]
cpus = launch_desc[:cpus]
cpus = launch_desc[:cpus]
datacenter = launch_desc[:datacenter]
datastore = launch_desc[:datastore]
memory = launch_desc[:memory]
template = launch_desc[:template]
user_data = launch_desc[:user_data]
virtual_disks = launch_desc[:virtual_disks]

datacenter = Vsphere.find_dc(datacenter)
datastore = Vsphere.find_ds(datacenter, datastore) # Need to add in round robin choosing or something
src_folder = datacenter.vmFolder

Ironfan.safely do
src_vm = Vsphere.find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, template)
clone_spec = generate_clone_spec(src_vm.config, datacenter, cpus, memory, datastore)
clone_spec = generate_clone_spec(src_vm.config, datacenter, cpus, memory, datastore, virtual_disks)

vsphere_server = src_vm.CloneVM_Task(:folder => src_vm.parent, :name => computer.name, :spec => clone_spec)
vsphere_server.wait_for_completion


# Will break if the VM isn't finished building.
new_vm = Vsphere.find_in_folder(src_folder, RbVmomi::VIM::VirtualMachine, computer.name)
Expand All @@ -185,9 +172,7 @@ def self.create!(computer)
# TODO - Move ReconfigVM_Task into it's own method
extraConfig = [{:key => 'guestinfo.pubkey', :value => public_key}, {:key => "guestinfo.user_data", :value => user_data}]
machine.ReconfigVM_Task(:spec => RbVmomi::VIM::VirtualMachineConfigSpec(:extraConfig => extraConfig)).wait_for_completion
# machine.ReconfigVM_Task(:spec => RbVmomi::VIM::VirtualMachineConfigSpec(: => user_data)).wait_for_completion
end

end

#
Expand All @@ -210,12 +195,6 @@ def self.load!(cluster=nil)
end
end

def receive_adaptee(obj)

obj = Ec2.connection.servers.new(obj) if obj.is_a?(Hash)
super
end

def self.destroy!(computer)
return unless computer.machine?
forget computer.machine.name
Expand All @@ -226,24 +205,23 @@ def self.launch_description(computer)
cloud = computer.server.cloud(:vsphere)
user_data_hsh = {
:chef_server => Chef::Config[:chef_server_url],
:node_name => computer.name,
:organization => Chef::Config[:organization],
:client_key => computer.private_key,
:cluster_name => computer.server.cluster_name,
:facet_name => computer.server.facet_name,
:facet_index => computer.server.index,
:client_key => computer.private_key,

:facet_name => computer.server.facet_name,
:node_name => computer.name,
:organization => Chef::Config[:organization],
}

description = {
:cpus => cloud.cpus,
:datacenter => cloud.datacenter,
:datastore => cloud.datastore,
:template => cloud.template,
:memory => cloud.memory,
:cpus => cloud.cpus,
:template => cloud.template,
:user_data => JSON.pretty_generate(user_data_hsh),
:virtual_disks => cloud.virtual_disks
}

description
end

Expand Down

0 comments on commit b8c6d8b

Please sign in to comment.