Merge branch 'master' of git.opennebula.org:one

share/install_gems/install_gems

@@ -15,11 +15,11 @@ GROUPS={
     :sunstone => %w{json rack sinatra thin},
     :cloud => %w{amazon-ec2 rack sinatra thin uuid curb},
     :ozones_client => %w{json},
-    :ozones_server => %w{json datamapper dm-sqlite-adapter dm-mysql-adapter}+[
+    :ozones_server => %w{json data_mapper dm-sqlite-adapter dm-mysql-adapter}+[
         SQLITE, 'mysql'
     ],
-    :ozones_server_sqlite => %w{json datamapper dm-sqlite-adapter}<<SQLITE,
-    :ozones_server_mysql => %w{json datamapper dm-mysql-adapter mysql},
+    :ozones_server_sqlite => %w{json data_mapper dm-sqlite-adapter}<<SQLITE,
+    :ozones_server_mysql => %w{json data_mapper dm-mysql-adapter mysql},
     :acct => ['sequel', SQLITE, 'mysql'],
     :acct_sqlite => ['sequel', SQLITE],
     :acct_mysql => ['sequel', 'mysql']
@@ -105,9 +105,17 @@ def get_gems(packages)
 end
 
 def detect_distro
-    lsb_info=`lsb_release -a`
-    if $?!=0 && false
-        STDERR.puts("lsb_release command not found")
+    begin
+        lsb_info=`lsb_release -a`
+    rescue
+    end
+
+    if $?.exitstatus!=0
+        STDERR.puts(<<-EOT.unindent(12))
+            lsb_release command not found. If you are using a RedHat based
+            distribution install redhat-lsb
+
+EOT
         return nil
     end
 

src/cli/one_helper/onevm_helper.rb

@@ -65,7 +65,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     def format_resource(vm)
         str_h1="%-80s"
         str="%-20s: %-20s"
-
+        
         CLIHelper.print_header(
             str_h1 % "VIRTUAL MACHINE #{vm['ID']} INFORMATION")
         puts str % ["ID", vm.id.to_s]
@@ -77,8 +77,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         puts str % ["HOSTNAME",
             vm['/VM/HISTORY_RECORDS/HISTORY[last()]/HOSTNAME']] if
                 %w{ACTIVE SUSPENDED}.include? vm.state_str
-        puts str % ["START TIME", OpenNebulaHelper.time_to_str(vm['STIME'])]
-        puts str % ["END TIME", OpenNebulaHelper.time_to_str(vm['ETIME'])]
+        puts str % ["START TIME",
+            OpenNebulaHelper.time_to_str(vm['/VM/STIME'])]
+        puts str % ["END TIME",
+            OpenNebulaHelper.time_to_str(vm['/VM/ETIME'])]
         value=vm['DEPLOY_ID']
         puts str % ["DEPLOY ID", value=="" ? "-" : value]
 

src/ozones/Server/bin/ozones-server

@@ -66,12 +66,15 @@ start()
     echo "The port $PORT is being used. Please specify a different one."
     exit 1
   fi
-  
+
   # Start the ozones daemon
   touch $OZONES_LOCK_FILE
   rackup $OZONES_SERVER -s thin -p $PORT -o $HOST \
                   -P $OZONES_PID &> $OZONES_LOG &
 
+  sleep 2
+  ps -p $(cat $OZONES_PID 2>/dev/null) > /dev/null 2>&1
+
   if [ $? -ne 0 ]; then
     echo "Error executing $OZONES_SERVER, please check the log $OZONES_LOG"
     exit 1