parent
3a19598730
commit
ffdee0185f
|
@ -33,12 +33,18 @@ def compute_providers
|
||||||
},
|
},
|
||||||
:server_attributes => {}.tap do |hash|
|
:server_attributes => {}.tap do |hash|
|
||||||
[:zone_id, :network_ids, :template_id, :service_offering_id].each do |k|
|
[:zone_id, :network_ids, :template_id, :service_offering_id].each do |k|
|
||||||
hash[k]= Fog.credentials["cloudstack_#{k}".to_sym]
|
key = "cloudstack_#{k}".to_sym
|
||||||
|
if Fog.credentials[key]
|
||||||
|
hash[k]= Fog.credentials[key]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
:volume_attributes => {:name => "somevolume"}.tap do |hash|
|
:volume_attributes => {:name => "somevolume"}.tap do |hash|
|
||||||
[:zone_id, :disk_offering_id].each do |k|
|
[:zone_id, :disk_offering_id].each do |k|
|
||||||
hash[k]= Fog.credentials["cloudstack_#{k}".to_sym]
|
key = "cloudstack_#{k}".to_sym
|
||||||
|
if Fog.credentials[key]
|
||||||
|
hash[k]= Fog.credentials[key]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
:security_group_attributes => {:name => "cloudstack.sg.#{Time.now.to_i}"},
|
:security_group_attributes => {:name => "cloudstack.sg.#{Time.now.to_i}"},
|
||||||
|
|
|
@ -15,7 +15,9 @@ if Fog.mock?
|
||||||
:bluebox_customer_id => 'bluebox_customer_id',
|
:bluebox_customer_id => 'bluebox_customer_id',
|
||||||
:brightbox_client_id => 'brightbox_client_id',
|
:brightbox_client_id => 'brightbox_client_id',
|
||||||
:brightbox_secret => 'brightbox_secret',
|
:brightbox_secret => 'brightbox_secret',
|
||||||
|
:cloudstack_disk_offering_id => '',
|
||||||
:cloudstack_host => 'http://cloudstack.example.org',
|
:cloudstack_host => 'http://cloudstack.example.org',
|
||||||
|
:cloudstack_network_ids => '',
|
||||||
:cloudstack_service_offering_id => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
|
:cloudstack_service_offering_id => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
|
||||||
:cloudstack_template_id => '8a31cf9c-f248-0588-256e-9dbf58785216',
|
:cloudstack_template_id => '8a31cf9c-f248-0588-256e-9dbf58785216',
|
||||||
:cloudstack_zone_id => 'c554c592-e09c-9df5-7688-4a32754a4305',
|
:cloudstack_zone_id => 'c554c592-e09c-9df5-7688-4a32754a4305',
|
||||||
|
|
Loading…
Reference in New Issue