From: Tomas Sedovic <[email protected]> This adds the news of the migration to the home page, updates the documentation on how to get the Core code and a fex text and code fixes here and there. --- README | 33 ++++++++++++++++++------------- deltacloud.org/content/index.haml | 16 ++------------ deltacloud.org/lib/data.rb | 31 ------------------------------ deltacloud.org/lib/news.rb | 13 ++++++++++++ deltacloud.org/lib/provider_support.rb | 31 ++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 58 deletions(-) delete mode 100644 deltacloud.org/lib/data.rb create mode 100644 deltacloud.org/lib/news.rb create mode 100644 deltacloud.org/lib/provider_support.rb
diff --git a/README b/README index c490c5e..d114220 100644 --- a/README +++ b/README @@ -5,25 +5,28 @@ The Deltacloud project consists of two parts: **Core** and **Aggregator**. Core gives you the API and drivers to various cloud providers. It also provides a client library (which Aggregator uses) and a commandline interface. -Aggregator is a web frontend to the API. The aggregator also depends on -Condor for its task implementation system. +Aggregator is a web system that uses the API to manage all your cloud assests. +It depends on [Condor][condor] for its task implementation system. -In addition, there is the **docs** repository that contains the project +In addition, we use the **docs** repository that contains the project documentation and the sources of the <http://deltacloud.org> website. -You can browse the repositories on the web: +The Deltacloud Core repository is hosted on [Apache Incubator][incubator]. To get the +latest code: -* [core](http://git.fedorahosted.org/git/?p=deltacloud/core.git;a=summary) -* [aggregator](http://git.fedorahosted.org/git/?p=deltacloud/aggregator.git;a=shortlog;h=refs/heads/next) -* [docs](http://git.fedorahosted.org/git/?p=deltacloud/docs.git;a=shortlog;h=refs/heads/next) + $ mkdir deltacloud + $ cd deltacloud + $ svn checkout https://svn.apache.org/repos/asf/incubator/deltacloud/trunk core -or download them to your computer: +**Note**: You can use git-svn, but be aware that it takes well over an hour to +fetch the complete revision history. + +The sources for Aggregator and docs are in git repositories: - $ git clone git://git.fedorahosted.org/git/deltacloud/core.git/ $ git clone --branch next git://git.fedorahosted.org/git/deltacloud/aggregator.git/ $ git clone --branch next git://git.fedorahosted.org/git/deltacloud/docs.git/ -Note that the development of the **docs** and **aggregator** takes place on the +Note that the development of the **Docs** and **Aggregator** takes place on the `next` branch, which contains the latest version of the code. If your `git` doesn't support the `--branch` option, do this instead: @@ -88,8 +91,6 @@ database backend: **Note:** you can update the paths in the "database.yml" file to change the location of the *.sqlite3 database files. -[SQlite]: http://sqlite.org/ - This command installs all the missing ruby gems: # rake gems:install @@ -160,8 +161,6 @@ The mock driver simulates the API behavior without making you to connect to a real cloud provider. For a guide to connecting Deltacloud to a provider, go to the [Drivers section of the Documentation][drivers]. -[drivers]: ./drivers.html - Make sure that the `src/db` and `src/log` directories are owned by the user who will be running the Aggregator. Note that you can change their location in the `config/database.yml` file. @@ -178,3 +177,9 @@ privileges. Run the following command in your `deltacloud/aggregator/src` directory (put the name of your Aggregator user in the brackets): $ rake dc:site_admin[aggregator_username] + + +[condor]: http://www.cs.wisc.edu/condor/ +[incubator]: http://incubator.apache.org/ +[SQlite]: http://sqlite.org/ +[drivers]: ./drivers.html diff --git a/deltacloud.org/content/index.haml b/deltacloud.org/content/index.haml index ca98311..066110b 100644 --- a/deltacloud.org/content/index.haml +++ b/deltacloud.org/content/index.haml @@ -49,19 +49,9 @@ filter: haml %h2 News %ul - %li - Deltacloud now - %a{ :href => "./drivers.html#providers" }> supports GoGrid - ! - %li - We've introduced - %a{ :href => "./api.html#h4_1" }Hardware Profiles - to the API. - %li - Deltacloud - %a{ :href => "http://press.redhat.com/2009/09/03/introducing-deltacloud/"; } - announced - at 2009 Red Hat Summit! + - all_news.each do |item| + %li + = item %br %br .section.video{ :style => "margin-top:16px;" } diff --git a/deltacloud.org/lib/data.rb b/deltacloud.org/lib/data.rb deleted file mode 100644 index 5235115..0000000 --- a/deltacloud.org/lib/data.rb +++ /dev/null @@ -1,31 +0,0 @@ -module DataHelper - def provider_support - [ - {:name => "Amazon EC2", :driver => true, :instance => { :create => true, :start => false, :stop => true, :reboot => true, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "GoGrid", :driver => true, :instance => { :create => true, :start => false, :stop => true, :reboot => true, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "OpenNebula", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => false, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "Rackspace", :driver => true, :instance => { :create => true, :start => false, :stop => true, :reboot => true, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "RHEV-M", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "RimuHosting", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "Terremark", :driver => false, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - {:name => "vCloud", :driver => false, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, - :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, - ] - end - - def support_indicator(value) - text = value ? "yes" : "no" - cls = value ? "supported" : "not-supported" - "<td class=\"#{cls}\">#{text}</td>" - end - -end - -Webby::Helpers.register(DataHelper) diff --git a/deltacloud.org/lib/news.rb b/deltacloud.org/lib/news.rb new file mode 100644 index 0000000..98e149b --- /dev/null +++ b/deltacloud.org/lib/news.rb @@ -0,0 +1,13 @@ +module NewsHelper + def all_news + [ + %Q(Deltacloud Core <a href="http://watzmann.net/blog/2010/07/deltacloud-apache-incubator.html";>moved to Apache Incubator</a>.), + %Q(Deltacloud now <a href="./drivers.html#providers">supports GoGrid</a>!), + %Q(We've introduced <a href="./api.html#h4_1">Hardware Profiles</a> to the API.), + %Q(Deltacloud <a href="http://press.redhat.com/2009/09/03/introducing-deltacloud/";>announced</a> at 2009 Red Hat Summit!), + ] + end + +end + +Webby::Helpers.register(NewsHelper) diff --git a/deltacloud.org/lib/provider_support.rb b/deltacloud.org/lib/provider_support.rb new file mode 100644 index 0000000..14c7dea --- /dev/null +++ b/deltacloud.org/lib/provider_support.rb @@ -0,0 +1,31 @@ +module ProviderSupportHelper + def provider_support + [ + {:name => "Amazon EC2", :driver => true, :instance => { :create => true, :start => false, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "GoGrid", :driver => true, :instance => { :create => true, :start => false, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "OpenNebula", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => false, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "Rackspace", :driver => true, :instance => { :create => true, :start => false, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "RHEV-M", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "RimuHosting", :driver => true, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "Terremark", :driver => false, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + {:name => "vCloud", :driver => false, :instance => { :create => true, :start => true, :stop => true, :reboot => true, :destroy => true }, + :list => { :hardware_profiles => true, :realms => true, :images => true, :instances => true} }, + ] + end + + def support_indicator(value) + text = value ? "yes" : "no" + cls = value ? "supported" : "not-supported" + "<td class=\"#{cls}\">#{text}</td>" + end + +end + +Webby::Helpers.register(ProviderSupportHelper) -- 1.7.1.1 _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
