shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

Added env variables harvesting

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@722 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Constantino Vázquez Blanco 2009-07-22 13:18:22 +00:00
parent 2d22b8146e
commit 434a164d94
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/oca/ec2/lib/EC2QueryClient.rb
View File

@ -2,6 +2,24 @@
require 'pp'
ONE_LOCATION=ENV["ONE_LOCATION"]
if !ONE_LOCATION
RUBY_LIB_LOCATION="/usr/lib/one/ruby"
else
RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
end
$: << RUBY_LIB_LOCATION
@@ec2url = nil
if ENV["EC2_URL"]
@@ec2url = ENV["EC2_URL"]
ENV["EC2_URL"]=nil
end
require 'rubygems'
require 'EC2'
require 'curb'
@ -21,9 +39,13 @@ module EC2QueryClient
#
#
#######################################################################
def initialize(secret=nil, endpoint="http://127.0.0.1:4567")
def initialize(secret=nil, endpoint=nil)
# Autentication
if secret
ec2auth = secret
elsif ENV["EC2_ACCESS_KEY"] and ENV["EC2_SECRET_KEY"]
ec2auth = ENV["EC2_ACCESS_KEY"] + ":" + ENV["EC2_SECRET_KEY"]
elsif ENV["ONE_AUTH"]
ec2auth = ENV["ONE_AUTH"]
end
@ -33,6 +55,16 @@ module EC2QueryClient
@access_key_id = $1
@access_key_secret = Digest::SHA1.hexdigest($2)
# Server location
if !endpoint
if @@ec2url
endpoint = @@ec2url
else
endpoint = "http://127.0.0.1:4567"
end
end
@uri = URI.parse(endpoint)
if !@uri.scheme or @uri.scheme != "http"
@ -41,6 +73,11 @@ module EC2QueryClient
raise "Wrong URI format, host not found"
end
pp @access_key_id
pp @access_key_secret
pp @uri.port
pp @uri.host
@ec2_connection = EC2::Base.new(
:access_key_id => @access_key_id,
:secret_access_key => @access_key_secret,
@ -170,6 +207,8 @@ module EC2QueryClient
return response
end
end
client = Client.new
end