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

Merge branch 'master' into feature-1099

Browse Source
This commit is contained in:
Ruben S. Montero 2012-05-05 20:57:07 +02:00
commit 1c4fca1ce2
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
share/etc/init.d/one.debian
View File

@ -64,6 +64,9 @@ case "$1" in
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
status)
status_of_proc "oned" "$NAME" && exit 0 || exit $?
;;
restart|force-reload)
#
# If the "reload" option is implemented then remove the
@ -87,7 +90,7 @@ case "$1" in
esac
;;
*)
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
exit 3
;;
esac

5
share/etc/init.d/one.ubuntu
View File

@ -64,6 +64,9 @@ case "$1" in
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
status)
status_of_proc "oned" "$NAME" && exit 0 || exit $?
;;
restart|force-reload)
#
# If the "reload" option is implemented then remove the
@ -87,7 +90,7 @@ case "$1" in
esac
;;
*)
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
exit 3
;;
esac

2
src/cloud/occi/etc/occi-server.conf
View File

@ -22,7 +22,7 @@
:one_xmlrpc: http://localhost:2633/RPC2
# Host and port where OCCI server will run
:server: localhost
:host: 127.0.0.1
:port: 4567
# SSL proxy that serves the API (set if is being used)

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

@ -89,7 +89,7 @@ enable_logging OCCI_LOG, settings.config[:debug_level].to_i
# Set Sinatra configuration
use Rack::Session::Pool, :key => 'occi'
set :public, Proc.new { File.join(root, "ui/public") }
set :public_folder, Proc.new { File.join(root, "ui/public") }
set :views, settings.root + '/ui/views'
if CloudServer.is_port_open?(settings.config[:server],
@ -101,10 +101,20 @@ if CloudServer.is_port_open?(settings.config[:server],
exit -1
end
set :bind, settings.config[:server]
host = settings.config[:host] || settings.config[:server]
set :bind, host
if settings.config[:server]
warning = "Warning: :server: configuration parameter has been deprecated."
warning << " Use :host: instead."
settings.logger.error warning
end
set :port, settings.config[:port]
# Create CloudAuth
begin
ENV["ONE_CIPHER_AUTH"] = OCCI_AUTH

3
src/dm/DispatchManagerActions.cc
View File

@ -602,9 +602,6 @@ int DispatchManager::resched(int vid, bool do_resched)
if (vm->get_state() == VirtualMachine::ACTIVE &&
vm->get_lcm_state() == VirtualMachine::RUNNING )
{
Nebula& nd = Nebula::instance();
LifeCycleManager * lcm = nd.get_lcm();
vm->set_resched(do_resched);
vmpool->update(vm);
}