From 98b0d7f40eb2ef5f79678f382ae2e5e4a05b1b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Font=C3=A1n=20Mui=C3=B1os?= <jfontan@fdi.ucm.es>
Date: Tue, 21 Jul 2009 16:22:28 +0000
Subject: [PATCH] Database parameter from configuration file is used in oca

git-svn-id: http://svn.opennebula.org/one/trunk@715 3034c82b-c49b-4eb3-8279-a7acafdc01c0
---
 src/oca/ec2/eco.rb         | 10 ++++++----
 src/oca/rm/repo_manager.rb |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/oca/ec2/eco.rb b/src/oca/ec2/eco.rb
index 091e905dfa..f12f10b2b5 100644
--- a/src/oca/ec2/eco.rb
+++ b/src/oca/ec2/eco.rb
@@ -19,20 +19,22 @@ require 'EC2'
 require 'time'
 
 require 'OpenNebula'
-require 'repo_manager'
+#require 'repo_manager'
 require 'OcaConfiguration'
 
 require 'pp'
 
 include OpenNebula
 
-
-
-
 CONFIG=OcaConfiguration.new(CONF_LOCATION+'/oca.conf')
 AUTH="#{CONFIG[:user]}:#{CONFIG[:password]}"
+ONE_RM_DATABASE=CONFIG[:database]
+
+# Load this gere to use ONE_RM_DATABASE form the configuration file
+require 'repo_manager'
 Image.image_dir=CONFIG[:image_dir]
 
+
 INSTANCE_TYPES=Hash.new
 
 pp CONFIG
diff --git a/src/oca/rm/repo_manager.rb b/src/oca/rm/repo_manager.rb
index 0c4c2e356f..2c171ca9e0 100644
--- a/src/oca/rm/repo_manager.rb
+++ b/src/oca/rm/repo_manager.rb
@@ -1,15 +1,17 @@
 
 require 'rubygems'
-#require 'storage_pool'
 require 'uuid'
 require 'fileutils'
-#gem 'sequel', '< 3.0'
 require 'sequel'
 require 'logger'
 
 # Seems that database should be opened before defining models
 # TODO: fix this
-DB=Sequel.sqlite('database.db')
+if ONE_RM_DATABASE
+    DB=Sequel.sqlite(ONE_RM_DATABASE)
+else
+    DB=Sequel.sqlite('database.db')
+end
 #DB.loggers << Logger.new($stdout)
 require 'image'