Revision 1af68074
Added by Daniel Lobato Garcia almost 9 years ago
| app/models/compute_resources/foreman/model/openstack.rb | ||
|---|---|---|
|
end
|
||
|
|
||
|
def create_vm(args = {})
|
||
|
boot_from_volume(args) if args[:boot_from_volume]
|
||
|
boot_from_volume(args) if Foreman::Cast.to_bool(args[:boot_from_volume])
|
||
|
network = args.delete(:network)
|
||
|
# fix internal network format for fog.
|
||
|
args[:nics].delete_if(&:blank?)
|
||
|
args[:nics].map! {|nic| { 'net_id' => nic } }
|
||
|
vm = super(args)
|
||
|
vm = super(args)
|
||
|
if network.present?
|
||
|
address = allocate_address(network)
|
||
|
assign_floating_ip(address, vm)
|
||
| ... | ... | |
|
end
|
||
|
|
||
|
def vm_instance_defaults
|
||
|
super.merge(
|
||
|
:key_name => key_pair.name
|
||
|
)
|
||
|
super.merge(:key_name => key_pair.name)
|
||
|
end
|
||
|
|
||
|
def assign_floating_ip(address, vm)
|
||
| test/unit/compute_resources/openstack_test.rb | ||
|---|---|---|
|
require 'test_helper'
|
||
|
|
||
|
class OpenstackTest < ActiveSupport::TestCase
|
||
|
setup do
|
||
|
@compute_resource = FactoryGirl.build(:openstack_cr)
|
||
|
end
|
||
|
|
||
|
teardown do
|
||
|
Fog.unmock!
|
||
|
end
|
||
|
|
||
|
test "#associated_host matches any NIC" do
|
||
|
host = FactoryGirl.create(:host, :ip => '10.0.0.154')
|
||
|
cr = FactoryGirl.build(:openstack_cr)
|
||
|
iface = mock('iface1', :floating_ip_address => '10.0.0.154', :private_ip_address => "10.1.1.1")
|
||
|
assert_equal host, as_admin { cr.associated_host(iface) }
|
||
|
assert_equal host, as_admin { @compute_resource.associated_host(iface) }
|
||
|
end
|
||
|
|
||
|
test "boot_from_volume does not get triggered when a string 'false' is passed as argument" do
|
||
|
Fog.mock!
|
||
|
@compute_resource.stubs(:key_pair).returns(mocked_key_pair)
|
||
|
@compute_resource.expects(:boot_from_volume).never
|
||
|
@compute_resource.create_vm(:boot_from_volume => 'false', :nics => [""],
|
||
|
:flavor_ref => 'foo_flavor', :image_ref => 'foo_image')
|
||
|
end
|
||
|
|
||
|
private
|
||
|
|
||
|
def mocked_key_pair
|
||
|
key_pair = mock
|
||
|
key_pair.stubs(:name).returns('foo_key')
|
||
|
key_pair
|
||
|
end
|
||
|
end
|
||
|
end
|
||
Also available in: Unified diff
Fixes #10867 - OpenStack boot_from_volume is true only when checked
(cherry picked from commit 776cff93637b006cb69063fecf142e776acd1378)