deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Koper, Dies" <di...@fast.au.fujitsu.com>
Subject RE: [PATCH core 49/51] FGCP: Renamed the driver class to be loadable and removed DEFAULT_CONFIG constant, because it's not longer set
Date Mon, 21 May 2012 12:36:15 GMT
Hi Michal,

> -  CERT_DIR = ENV['FGCP_CERT_DIR'] ||
> File::expand_path(File::join(DEFAULT_CONFIG, 'fgcp'))
> +  CERT_DIR = ENV['FGCP_CERT_DIR']

I thought that we agreed on IRC to use something like
+  CERT_DIR = ENV['FGCP_CERT_DIR'] ||
File::expand_path('~\.deltacloud\config\fgcp')
?

Regards,
Dies Koper



> -----Original Message-----
> From: mfojtik@redhat.com [mailto:mfojtik@redhat.com]
> Sent: Monday, 21 May 2012 8:08 PM
> To: dev@deltacloud.apache.org
> Subject: [PATCH core 49/51] FGCP: Renamed the driver class to be
loadable
> and removed DEFAULT_CONFIG constant, because it's not longer set
> 
> From: Michal Fojtik <mfojtik@redhat.com>
> 
> 
> Signed-off-by: Michal fojtik <mfojtik@redhat.com>
> ---
>  server/lib/deltacloud/drivers/fgcp/fgcp_client.rb |    1 -
>  server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb |    9 ++++-----
>  2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
> b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
> index 9072c84..b0e1897 100644
> --- a/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
> +++ b/server/lib/deltacloud/drivers/fgcp/fgcp_client.rb
> @@ -15,7 +15,6 @@
>  #
>  # Author: Dies Koper <diesk@fast.au.fujitsu.com>
> 
> -require 'deltacloud/base_driver'
>  require 'net/http'
>  require 'net/https'
>  require 'rubygems'
> diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
> b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
> index 93ab8fa..4d65e7c 100644
> --- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
> +++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
> @@ -15,17 +15,16 @@
>  #
>  # Author: Dies Koper <diesk@fast.au.fujitsu.com>
> 
> -require 'deltacloud/base_driver'
> -require 'deltacloud/drivers/fgcp/fgcp_client'
> +require_relative 'fgcp_client'
>  require 'openssl'
>  require 'xmlsimple'
> 
>  module Deltacloud
>    module Drivers
> -    module FGCP
> -class FGCPDriver < Deltacloud::BaseDriver
> +    module Fgcp
> +class FgcpDriver < Deltacloud::BaseDriver
> 
> -  CERT_DIR = ENV['FGCP_CERT_DIR'] ||
> File::expand_path(File::join(DEFAULT_CONFIG, 'fgcp'))
> +  CERT_DIR = ENV['FGCP_CERT_DIR']
> 
>    def supported_collections
>      DEFAULT_COLLECTIONS + [ :addresses, :load_balancers, :firewalls ]
> --
> 1.7.10.1
> 



Mime
View raw message