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

Make Oca aware of ONE_LOCATION

Browse Source 
git-svn-id: http://svn.opennebula.org/one/trunk@712 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
Javier Fontán Muiños 2009-07-21 15:23:08 +00:00
parent f0167f2012
commit 1c35ad7980
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/oca/ec2/eco.rb
View File

@ -1,12 +1,23 @@
ONE_LOCATION=ENV["ONE_LOCATION"]
if !ONE_LOCATION
RUBY_LIB_LOCATION="/usr/lib/one/ruby"
else
RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
TEMPLATES_LOCATION=ONE_LOCATION+"/etc/ec2query_templates"
CONF_LOCATION=ONE_LOCATION+"/etc"
end
$: << RUBY_LIB_LOCATION
require 'rubygems'
require 'sinatra'
require 'EC2'
require 'time'
$: << './OpenNebulaApi'
$: << './lib'
require 'OpenNebula'
require 'repo_manager'
require 'OcaConfiguration'
@ -18,8 +29,9 @@ include OpenNebula
CONFIG=OcaConfiguration.new('oca.conf')
CONFIG=OcaConfiguration.new(CONF_LOCATION+'/oca.conf')
AUTH="#{CONFIG[:user]}:#{CONFIG[:password]}"
Image.image_dir=CONFIG[:image_dir]
INSTANCE_TYPES=Hash.new
@ -159,7 +171,8 @@ def run_instances(params)
@vm_info[:instance_type]=instance_type_name
template=ERB.new(File.read("templates/#{instance_type['TEMPLATE']}"))
template=ERB.new(File.read(
TEMPLATES_LOCATION+"/#{instance_type['TEMPLATE']}"))
template_text=template.result(binding)
pp template_text
@ -279,7 +292,7 @@ __END__
<% vm.info %>
<item>
<instanceId><%= vm.id %></instanceId>
<imageId><%= vm.id %></imageId>
<imageId><%= vm['TEMPLATE/IMAGE_ID'] %></imageId>
<instanceState>
<%= render_state(vm) %>
</instanceState>