diff options
| author | Matthew Hicks <mhicks@mhicks-host.usersys.redhat.com> | 2008-06-22 14:18:19 -0400 |
|---|---|---|
| committer | Matthew Hicks <mhicks@mhicks-host.usersys.redhat.com> | 2008-06-22 14:18:19 -0400 |
| commit | e50df69fcfffb73bab95c14c3b80c0f8cefeb29c (patch) | |
| tree | 9db7075ea4cc35d3cf41514e06404333980e438e /cloudmasterd/lib | |
| parent | 7e3418b42b7688bf45018e091eabe86109490de9 (diff) | |
| download | tools-e50df69fcfffb73bab95c14c3b80c0f8cefeb29c.tar.gz tools-e50df69fcfffb73bab95c14c3b80c0f8cefeb29c.tar.xz tools-e50df69fcfffb73bab95c14c3b80c0f8cefeb29c.zip | |
Adding initial redirect
Diffstat (limited to 'cloudmasterd/lib')
| -rw-r--r-- | cloudmasterd/lib/cloudmasterd.rb | 8 | ||||
| -rw-r--r-- | cloudmasterd/lib/cloudmasterd/version.rb | 2 |
2 files changed, 5 insertions, 5 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 diff --git a/cloudmasterd/lib/cloudmasterd/version.rb b/cloudmasterd/lib/cloudmasterd/version.rb index ec06723..e3f960b 100644 --- a/cloudmasterd/lib/cloudmasterd/version.rb +++ b/cloudmasterd/lib/cloudmasterd/version.rb @@ -2,7 +2,7 @@ module Cloudmasterd #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 1 - TINY = 4 + TINY = 5 STRING = [MAJOR, MINOR, TINY].join('.') end |
