You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2011/10/26 14:31:47 UTC

[PATCH core] Core: Fixed deltacloudd ability to list available drivers

From: Bulat Shakirzyanov <ma...@gmail.com>


Signed-off-by: Michal fojtik <mf...@redhat.com>
---
 server/bin/deltacloudd |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
index 46f5616..e8fca6e 100755
--- a/server/bin/deltacloudd
+++ b/server/bin/deltacloudd
@@ -16,6 +16,8 @@
 # under the License.
 #
 
+$:.unshift File.join(File.dirname(__FILE__), '..')
+
 require 'rubygems'
 require 'optparse'
 require 'yaml'
@@ -115,7 +117,10 @@ unless options[:drivers] or ENV["API_DRIVER"]
 end
 
 if options[:drivers]
-  require 'server.rb'
+  $top_srcdir = File.join(File.dirname(__FILE__), '..')
+  $:.unshift File.join($top_srcdir, 'lib')
+  server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
+  load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
   puts "Available drivers:\n\n"
   puts "* " + driver_config.keys.map{ |d| d.to_s }.join("\n* ")
   puts
-- 
1.7.4.4


Re: [PATCH core] Core: Fixed deltacloudd ability to list available drivers

Posted by "marios@redhat.com" <ma...@redhat.com>.
ACK

On 26/10/11 15:31, mfojtik@redhat.com wrote:
> From: Bulat Shakirzyanov <ma...@gmail.com>
> 
> 
> Signed-off-by: Michal fojtik <mf...@redhat.com>
> ---
>  server/bin/deltacloudd |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/server/bin/deltacloudd b/server/bin/deltacloudd
> index 46f5616..e8fca6e 100755
> --- a/server/bin/deltacloudd
> +++ b/server/bin/deltacloudd
> @@ -16,6 +16,8 @@
>  # under the License.
>  #
>  
> +$:.unshift File.join(File.dirname(__FILE__), '..')
> +
>  require 'rubygems'
>  require 'optparse'
>  require 'yaml'
> @@ -115,7 +117,10 @@ unless options[:drivers] or ENV["API_DRIVER"]
>  end
>  
>  if options[:drivers]
> -  require 'server.rb'
> +  $top_srcdir = File.join(File.dirname(__FILE__), '..')
> +  $:.unshift File.join($top_srcdir, 'lib')
> +  server_dir = ENV['API_FRONTEND'] == 'cimi' ? 'cimi' : 'deltacloud'
> +  load File.join($top_srcdir, 'lib', server_dir, 'server.rb')
>    puts "Available drivers:\n\n"
>    puts "* " + driver_config.keys.map{ |d| d.to_s }.join("\n* ")
>    puts