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

make use of the new conf. filename

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@740 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Rubén S. Montero 2009-07-23 13:38:53 +00:00
parent 27cd41ba9a
commit fb934b0d4c
3 changed files with 3 additions and 3 deletions

2
src/cloud/ec2/OcaConfiguration.rb

@ -67,7 +67,7 @@ if $0 == __FILE__
require 'pp' require 'pp'
conf=OcaConfiguration.new('oca.conf') conf=OcaConfiguration.new('econe.conf')
pp conf.conf pp conf.conf
end end

2
src/cloud/ec2/eco.rb

@ -27,7 +27,7 @@ require 'pp'
include OpenNebula include OpenNebula
CONFIG=OcaConfiguration.new(CONF_LOCATION+'/oca.conf') CONFIG=OcaConfiguration.new(CONF_LOCATION+'/econe.conf')
AUTH="#{CONFIG[:user]}:#{CONFIG[:password]}" AUTH="#{CONFIG[:user]}:#{CONFIG[:password]}"
ONE_RM_DATABASE=CONFIG[:database] ONE_RM_DATABASE=CONFIG[:database]

2
src/cloud/ec2/econe-server

@ -1,6 +1,6 @@
#!/bin/bash #!/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 export TMPDIR=$IMG_DIR/tmp
mkdir -p $TMPDIR mkdir -p $TMPDIR