From fb934b0d4c272e8b61eb9732154b64a5a9ee44eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20S=2E=20Montero?= Date: Thu, 23 Jul 2009 13:38:53 +0000 Subject: [PATCH] make use of the new conf. filename git-svn-id: http://svn.opennebula.org/one/trunk@740 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/cloud/ec2/OcaConfiguration.rb | 2 +- src/cloud/ec2/eco.rb | 2 +- src/cloud/ec2/econe-server | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cloud/ec2/OcaConfiguration.rb b/src/cloud/ec2/OcaConfiguration.rb index 259b559044..d9acdbc38e 100644 --- a/src/cloud/ec2/OcaConfiguration.rb +++ b/src/cloud/ec2/OcaConfiguration.rb @@ -67,7 +67,7 @@ if $0 == __FILE__ require 'pp' - conf=OcaConfiguration.new('oca.conf') + conf=OcaConfiguration.new('econe.conf') pp conf.conf end diff --git a/src/cloud/ec2/eco.rb b/src/cloud/ec2/eco.rb index 66aedc8738..13d32b0e75 100644 --- a/src/cloud/ec2/eco.rb +++ b/src/cloud/ec2/eco.rb @@ -27,7 +27,7 @@ require 'pp' include OpenNebula -CONFIG=OcaConfiguration.new(CONF_LOCATION+'/oca.conf') +CONFIG=OcaConfiguration.new(CONF_LOCATION+'/econe.conf') AUTH="#{CONFIG[:user]}:#{CONFIG[:password]}" ONE_RM_DATABASE=CONFIG[:database] diff --git a/src/cloud/ec2/econe-server b/src/cloud/ec2/econe-server index 4b2bdbe500..9d90b92a96 100755 --- a/src/cloud/ec2/econe-server +++ b/src/cloud/ec2/econe-server @@ -1,6 +1,6 @@ #!/bin/bash -eval `grep ^IMAGE_DIR= $ONE_LOCATION/etc/oca.conf ` +eval `grep ^IMAGE_DIR= $ONE_LOCATION/etc/econe.conf ` export TMPDIR=$IMG_DIR/tmp mkdir -p $TMPDIR