summaryrefslogtreecommitdiffstats
path: root/cloudmasterd/lib/cloudmasterd.rb
diff options
context:
space:
mode:
Diffstat (limited to 'cloudmasterd/lib/cloudmasterd.rb')
-rw-r--r--cloudmasterd/lib/cloudmasterd.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudmasterd/lib/cloudmasterd.rb b/cloudmasterd/lib/cloudmasterd.rb
index a9303c7..d26c9bb 100644
--- a/cloudmasterd/lib/cloudmasterd.rb
+++ b/cloudmasterd/lib/cloudmasterd.rb
@@ -251,7 +251,7 @@ module Cloudmasterd::Controllers
end
end
- class Cloud < REST 'cloud'
+ class Status < REST 'status'
def list
@machines = {}
Machine.find(:all, :select => "distinct email").map{|x| x.email}.each do |email|
@@ -259,7 +259,7 @@ module Cloudmasterd::Controllers
end
@memory = Memory.find(:all)[0][:free]
- render :cloud
+ render :status
end
end
end
@@ -275,7 +275,7 @@ module Cloudmasterd::Views
html do
head do
title 'Everest Cloud Master Controller'
- #link :rel => 'stylesheet', :type => 'text/css', :href => self/'/styles.css', :media => 'screen'
+ link :rel => 'stylesheet', :type => 'text/css', :href => "/styles.css", :media => 'screen'
end
body do
div.content do
@@ -285,7 +285,7 @@ module Cloudmasterd::Views
end
end
- def cloud
+ def status
div.memory! do
h2 "Available cloud memory: #{@memory}"
end