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

feature #795: Use yaml conf file in OCCI

Browse Source
This commit is contained in:
Daniel Molina 2011-09-21 19:02:30 +02:00
parent 2be5ec5694
commit 3276069da2
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cloud/occi/lib/VirtualMachineOCCI.rb
View File

@ -77,8 +77,8 @@ class VirtualMachineOCCI < VirtualMachine
if @vm_info != nil
itype = @vm_info['INSTANCE_TYPE']
if itype != nil and types[itype] != nil
@template = base + "/#{types[itype]['TEMPLATE']}"
if itype != nil and types[itype.to_sym] != nil
@template = base + "/#{types[itype.to_sym][:template]}"
end
end

30
src/cloud/occi/lib/occi-server.rb
View File

@ -45,34 +45,34 @@ require 'rubygems'
require 'sinatra'
require 'OCCIServer'
require 'Configuration'
include OpenNebula
##############################################################################
# Parse Configuration file
##############################################################################
begin
config = Configuration.new(CONFIGURATION_FILE)
config.add_configuration_value("TEMPLATE_LOCATION", TEMPLATE_LOCATION)
instance_types = CloudServer.get_instance_types(config)
config.add_configuration_value("INSTANCE_TYPES", instance_types)
CloudServer.print_configuration(config)
set :config, config
conf = YAML.load_file(CONFIGURATION_FILE)
rescue Exception => e
puts "Error starting server: #{e}"
exit(-1)
puts "Error parsing config file #{CONFIGURATION_FILE}: #{e.message}"
exit 1
end
conf[:template_location] = TEMPLATE_LOCATION
CloudServer.print_configuration(conf)
##############################################################################
# Sinatra Configuration
##############################################################################
set :config, conf
if CloudServer.is_port_open?(settings.config[:server],
settings.config[:port])
puts "Port busy, please shutdown the service or move occi server port."
exit
end
##############################################################################
# Sinatra Configuration
##############################################################################
set :host, settings.config[:server]
set :port, settings.config[:port]