mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-16 09:43:18 +09:00
Merge branch 'sunstone' of opennebula.org:one-ui into sunstone
This commit is contained in:
commit
50e88ff201
12 files changed
+119
-22
No files matched your search
@@ -0,0 +1,102 @@
|
||||
if [ -z "$ONE_LOCATION" ]; then
|
||||
SUNSTONE_PID=/var/run/one/sunstone.pid
|
||||
SUNSTONE_SERVER=/usr/lib/one/sunstone/config.ru
|
||||
SUNSTONE_LOCK_FILE=/var/lock/one/.sunstone.lock
|
||||
SUNSTONE_LOG=/var/log/one/sunstone.log
|
||||
else
|
||||
SUNSTONE_PID=$ONE_LOCATION/var/sunstone.pid
|
||||
SUNSTONE_SERVER=$ONE_LOCATION/lib/sunstone/config.ru
|
||||
SUNSTONE_LOCK_FILE=$ONE_LOCATION/var/.sunstone.lock
|
||||
SUNSTONE_LOG=$ONE_LOCATION/var/sunstone.log
|
||||
fi
|
||||
|
||||
PORT="4567"
|
||||
HOST="127.0.0.1"
|
||||
|
||||
setup()
|
||||
{
|
||||
|
||||
if [ -f $SUNSTONE_LOCK_FILE ]; then
|
||||
if [ -f $SUNSTONE_PID ]; then
|
||||
SUNSTONEPID=`cat $SUNSTONE_PID`
|
||||
ps $SUNSTONEPID &> /dev/null
|
||||
if [ $? -eq 0 ]; then
|
||||
echo "Sunstone Server is still running (PID:$SUNSTONEPID). Please try 'sunstone-server stop' first."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
echo "Stale .lock detected. Erasing it."
|
||||
rm $SUNSTONE_LOCK_FILE
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
start()
|
||||
{
|
||||
if [ ! -f "$SUNSTONE_SERVER" ]; then
|
||||
echo "Can not find $SUNSTONE_SERVER."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Start the sunstone daemon
|
||||
touch $SUNSTONE_LOCK_FILE
|
||||
rackup $SUNSTONE_SERVER -s thin -p $PORT -o $HOST -P $SUNSTONE_PID &> $SUNSTONE_LOG &
|
||||
|
||||
LASTRC=$?
|
||||
|
||||
if [ $LASTRC -ne 0 ]; then
|
||||
echo "Error executing $SUNSTONE_SERVER"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
ps $LASTPID &> /dev/null
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error executing $SUNSTONE_SERVER."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "sunstone-server started"
|
||||
}
|
||||
|
||||
#
|
||||
# Function that stops the daemon/service
|
||||
#
|
||||
stop()
|
||||
{
|
||||
if [ ! -f $SUNSTONE_PID ]; then
|
||||
echo "Couldn't find sunstone-server process pid."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Kill the sunstone daemon
|
||||
kill -INT `cat $SUNSTONE_PID` &> /dev/null
|
||||
|
||||
echo "sunstone-server stopped"
|
||||
}
|
||||
|
||||
while getopts "p:h:" OPTION
|
||||
do
|
||||
case $OPTION in
|
||||
p) PORT=$OPTARG;;
|
||||
h) HOST=$OPTARG;;
|
||||
\?) echo "Invalid option: -$OPTARG" >&2; exit 3 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
shift $((OPTIND-1))
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
setup
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
*)
|
||||
echo "Usage: sunstone {start|stop}" >&2
|
||||
exit 3
|
||||
;;
|
||||
esac
|
||||
@@ -19,6 +19,6 @@
|
||||
# TBD Change path for intallation tree
|
||||
$: << File.dirname(__FILE__)
|
||||
|
||||
require 'one-ui.rb'
|
||||
require 'sunstone-server.rb'
|
||||
|
||||
run Sinatra::Application
|
||||
@@ -18,29 +18,24 @@ ONE_LOCATION = ENV["ONE_LOCATION"]
|
||||
|
||||
if !ONE_LOCATION
|
||||
RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
|
||||
VAR_LOCATION = "/var/lib/one"
|
||||
else
|
||||
RUBY_LIB_LOCATION = ONE_LOCATION+"/lib/ruby"
|
||||
VAR_LOCATION = ONE_LOCATION+"/var"
|
||||
end
|
||||
|
||||
$: << RUBY_LIB_LOCATION
|
||||
$: << File.dirname(__FILE__)
|
||||
|
||||
require 'OpenNebula'
|
||||
include OpenNebula
|
||||
|
||||
# TBD Change path for intallation tree
|
||||
#require 'OpenNebulaJSON/PoolJSON'
|
||||
#require 'OpenNebulaJSON/HostJSON'
|
||||
#require 'OpenNebulaJSON/JSONUtils'
|
||||
require 'models/OpenNebulaJSON/ClusterJSON'
|
||||
require 'models/OpenNebulaJSON/HostJSON'
|
||||
require 'models/OpenNebulaJSON/ImageJSON'
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'models/OpenNebulaJSON/PoolJSON'
|
||||
require 'models/OpenNebulaJSON/UserJSON'
|
||||
require 'models/OpenNebulaJSON/VirtualMachineJSON'
|
||||
require 'models/OpenNebulaJSON/VirtualNetworkJSON'
|
||||
require 'OpenNebulaJSON/ClusterJSON'
|
||||
require 'OpenNebulaJSON/HostJSON'
|
||||
require 'OpenNebulaJSON/ImageJSON'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/PoolJSON'
|
||||
require 'OpenNebulaJSON/UserJSON'
|
||||
require 'OpenNebulaJSON/VirtualMachineJSON'
|
||||
require 'OpenNebulaJSON/VirtualNetworkJSON'
|
||||
|
||||
module OpenNebula
|
||||
class Error
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
|
||||
module OpenNebulaJSON
|
||||
class ClusterJSON < OpenNebula::Cluster
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
|
||||
module OpenNebulaJSON
|
||||
class HostJSON < OpenNebula::Host
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
|
||||
module OpenNebulaJSON
|
||||
class ImageJSON < OpenNebula::Image
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
|
||||
module OpenNebulaJSON
|
||||
class HostPoolJSON < OpenNebula::HostPool; include JSONUtils; end
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
|
||||
module OpenNebulaJSON
|
||||
class UserJSON < OpenNebula::User
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
|
||||
module OpenNebulaJSON
|
||||
class VirtualMachineJSON < OpenNebula::VirtualMachine
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# limitations under the License. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
require 'models/OpenNebulaJSON/JSONUtils'
|
||||
require 'OpenNebulaJSON/JSONUtils'
|
||||
|
||||
module OpenNebulaJSON
|
||||
class VirtualNetworkJSON < OpenNebula::VirtualNetwork
|
||||
|
||||
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user