kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Without setting SMP the web UI won't load :-/

Browse source
This commit is contained in:
Sean Handley 2012-07-16 20:50:27 +02:00
parent d142bcd2cf
commit 759e43f058
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/fog/serverlove/models/compute/server.rb
View file

@ -11,14 +11,15 @@ module Fog
attribute :name attribute :name
attribute :cpu attribute :cpu
attribute :mem attribute :mem
attribute :smp
attribute :ide_0_0, :aliases => 'ide:0:0' attribute :ide_0_0, :aliases => 'ide:0:0'
attribute :ide_0_1, :aliases => 'ide:0:1' attribute :ide_0_1, :aliases => 'ide:0:1'
attribute :ide_1_0, :aliases => 'ide:1:0' attribute :ide_1_0, :aliases => 'ide:1:0'
attribute :ide_1_1, :aliases => 'ide:1:1' attribute :ide_1_1, :aliases => 'ide:1:1'
attribute :boot attribute :boot
attribute :persistent attribute :persistent
attribute :vnc
attribute :vnc_password, :aliases => 'vnc:password' attribute :vnc_password, :aliases => 'vnc:password'
attribute :vnc, :aliases => 'vnc'
attribute :status attribute :status
attribute :user attribute :user
attribute :started attribute :started
@ -48,7 +49,7 @@ module Fog
def allowed_attributes def allowed_attributes
allowed = [ allowed = [
:name, :cpu, :mem, :persistent, :name, :cpu, :smp, :mem, :persistent,
:vnc_password, :vnc, :vnc_password, :vnc,
:ide_0_0, :ide_0_1, :ide_1_0, :ide_1_1, :ide_0_0, :ide_0_1, :ide_1_0, :ide_1_1,
:boot, :nic_0_model, :nic_0_dhcp :boot, :nic_0_model, :nic_0_dhcp
@ -59,7 +60,7 @@ module Fog
def self.defaults def self.defaults
# TODO: Document default settings. # TODO: Document default settings.
# Note that VNC password standards are strict (need explaining) # Note that VNC password standards are strict (need explaining)
{ 'nic:0:model' => 'e1000', 'nic:0:dhcp' => 'auto', 'vnc' => 'auto', 'vnc:password' => 'QXBwKEKQ' } { 'nic:0:model' => 'e1000', 'nic:0:dhcp' => 'auto', 'vnc' => 'auto', 'vnc:password' => 'QXBwKEKQ', 'smp' => 'auto' }
end end
end end
end end

1
tests/serverlove/requests/compute/server_tests.rb
View file

@ -8,6 +8,7 @@ Shindo.tests('Fog::Compute[:serverlove] | server requests', ['serverlove']) do
'started' => Fog::Nullable::String, 'started' => Fog::Nullable::String,
'cpu' => Integer, 'cpu' => Integer,
'mem' => Integer, 'mem' => Integer,
'smp' => Fog::Nullable::String,
'persistent' => Fog::Nullable::String, 'persistent' => Fog::Nullable::String,
'vnc' => Fog::Nullable::String, 'vnc' => Fog::Nullable::String,
'vnc:password' => Fog::Nullable::String, 'vnc:password' => Fog::Nullable::String,