cloudkeeper-one 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 782d5e9a1c747b951cc7a253f90a029a90d42256
-  data.tar.gz: b6debe2f03c6f5c199b72cab2628feaf04b15748
+  metadata.gz: 9d4f43bd15b32c1d02aae284b97d12baafb1491e
+  data.tar.gz: 06c4f1b3c6ad21c30bf71477b0b44b571ce69240
 SHA512:
-  metadata.gz: 6bae19c429f299deab00c21d0551b033211935a8aca701d4e51d1ffe5054ffd1cddc6348b0f91e0c300137c07ea38eab0492f736d48d0f342ef75c35a7fce562
-  data.tar.gz: 01676f4e211792611c3c8f774f110b2dee4eeef4a480c5a84499cab4de171f88fcdf3ebcbc3efb25fdb123462ad1d540ae01bda5899070c4c01c6ec9ceaec4b0
+  metadata.gz: af3ffac5e682f97bfb76ac273d0a27c58900560c62291cf739f0506d27b691dcb28ae31fa357278c21cb87d48b69bea8be1aa668c5548d31b7ee78311b564fa3
+  data.tar.gz: d9bcce658d11f698a58873c1645fae55a00a0ad829d0b88a5efb5069fcfd92b7a5a336230cc33cc163850db6c5f52c6c5145726ec92f39c09989d3bb6e36f8ad

data/README.md

@@ -9,20 +9,20 @@ OpenNebula backend for [cloudkeeper](https://github.com/the-cloudkeeper-project/
 ## What does cloudkeeper-one do?
 cloudkeeper-one is able to manage [OpenNebula](https://opennebula.org/) cloud - upload, update and remove images and templates representing EGI AppDB appliances. cloudkeeper-one runs as a server listening for [gRPC](http://www.grpc.io/) communication usually from core [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper) component.
 
-##Requirements
-* Ruby >= 2.0.0
+## Requirements
+* Ruby >= 2.2.0
 * Rubygems
 * OpenNebula >= 5.2 (doesn't have to be present on the same machine)
 
 ## Installation
 
-###From RubyGems.org
+### From RubyGems.org
 To install the most recent stable version
 ```bash
 gem install cloudkeeper-one
 ```
 
-###From source (dev)
+### From source (dev)
 **Installation from source should never be your first choice! Especially, if you are not
 familiar with RVM, Bundler, Rake and other dev tools for Ruby!**
 
@@ -38,8 +38,8 @@ bundle install
 bundle exec rake spec
 ```
 
-##Configuration
-###Create a configuration file for cloudkeeper-one
+## Configuration
+### Create a configuration file for cloudkeeper-one
 Configuration file can be read by cloudkeeper-one from these
 three locations:
 

data/cloudkeeper-one.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'OpenNebula backend for cloudkeeper'
   spec.description   = 'OpenNebula backend for cloudkeeper'
-  spec.homepage      = 'https://github.com/Misenko/cloudkeeper-one'
+  spec.homepage      = 'https://github.com/the-cloudkeeper-project/cloudkeeper-one'
   spec.license       = 'Apache License, Version 2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/examples/etc/init.d/cloudkeeper-one

@@ -0,0 +1,125 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          cloudkeeper-one
+# Required-Start:    $local_fs $remote_fs $network $syslog $named
+# Required-Stop:     $local_fs $remote_fs $network $syslog $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start/stop cloudkeeper-one GRPC server
+# Description:       Start the GRPC server for cloudkeeper-one.
+### END INIT INFO
+
+run_dir="/var/run/cloudkeeper-one"
+log_dir="/var/log/cloudkeeper-one"
+conf_dir="/etc/cloudkeeper-one"
+
+omnibus_base_dir="/opt/cloudkeeper-one"
+embedded_base_dir="$omnibus_base_dir/embedded"
+embedded_ruby_version=`$embedded_base_dir/bin/ruby -e "puts RUBY_VERSION.split('.').fill('0',2..2).join('.')"`
+embedded_cloudkeeper_one_version=`$omnibus_base_dir/bin/cloudkeeper-one version`
+embedded_cloudkeeper_one_dir="$embedded_base_dir/lib/ruby/gems/$embedded_ruby_version/gems/cloudkeeper-one-$embedded_cloudkeeper_one_version"
+
+user="cloudkeeper-one"
+cmd="$omnibus_base_dir/bin/cloudkeeper-one"
+
+name=`basename $0`
+pid_file="$run_dir/cloudkeeper-one.init.pid"
+stdout_log="$log_dir/cloudkeeper-one.init.stdout.log"
+stderr_log="$log_dir/cloudkeeper-one.init.stderr.log"
+
+retval=0
+
+get_pid() {
+    cat "$pid_file"
+}
+
+is_running() {
+    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
+}
+
+start() {
+    if is_running; then
+        echo "Already started"
+    else
+        echo "Starting $name ..."
+
+        cd "$run_dir"
+        sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" &
+
+        echo $! > "$pid_file"
+        if ! is_running; then
+            echo "Unable to start, see $stdout_log and $stderr_log"
+            retval=1
+        else
+            echo "Started"
+        fi
+    fi
+}
+
+stop() {
+    if is_running; then
+        echo "Stopping $name ..."
+
+        kill -SIGINT `get_pid`
+        for i in $(seq 1 15); do
+            if ! is_running; then
+                break
+            fi
+            echo -n "."
+            sleep 1
+        done
+
+        echo
+        if is_running; then
+            echo "Not stopped; may still be shutting down or shutdown may have failed"
+            kill -SIGKILL `get_pid`
+            retval=1
+        else
+            echo "Stopped"
+            if [ -f "$pid_file" ]; then
+                rm "$pid_file"
+            fi
+        fi
+    else
+        echo "Not running"
+        retval=1
+    fi
+}
+
+restart(){
+    stop
+
+    if is_running; then
+        echo "Unable to stop, will not attempt to start"
+        retval=1
+    else
+        start
+    fi
+}
+
+case "$1" in
+    start)
+    start
+    ;;
+    stop)
+    stop
+    ;;
+    restart)
+    restart
+    ;;
+    status)
+    if is_running; then
+        echo "Running"
+    else
+        echo "Stopped"
+        retval=3
+    fi
+    ;;
+    *)
+    echo "Usage: $name {start|stop|restart|status}"
+    retval=1
+    ;;
+esac
+
+exit $retval

data/lib/cloudkeeper/one/cli.rb

@@ -5,6 +5,10 @@ require 'chronic_duration'
 module Cloudkeeper
   module One
     class CLI < Thor
+      SIGINT = 2
+      SIGTERM = 15
+      SIGNALS = [SIGTERM, SIGINT].freeze
+
       class_option :'logging-level',
                    required: true,
                    default: Cloudkeeper::One::Settings['logging']['level'],
@@ -96,7 +100,8 @@ module Cloudkeeper
         grpc_server.add_http2_port Cloudkeeper::One::Settings[:'listen-address'], credentials
         grpc_server.handle Cloudkeeper::One::CoreConnector
         grpc_server.run_till_terminated
-      rescue Interrupt
+      rescue SignalException => ex
+        raise ex unless SIGNALS.include? ex.signo
         grpc_server.stop
       rescue Cloudkeeper::One::Errors::InvalidConfigurationError => ex
         abort ex.message

data/lib/cloudkeeper/one/version.rb

@@ -1,5 +1,5 @@
 module Cloudkeeper
   module One
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper-one
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -313,6 +313,7 @@ files:
 - config/cloudkeeper-one.yml
 - config/templates/image.erb
 - config/templates/template.erb
+- examples/etc/init.d/cloudkeeper-one
 - lib/cloudkeeper/one.rb
 - lib/cloudkeeper/one/appliance_actions.rb
 - lib/cloudkeeper/one/appliance_actions/list.rb
@@ -358,7 +359,7 @@ files:
 - lib/cloudkeeper/one/settings.rb
 - lib/cloudkeeper/one/version.rb
 - lib/cloudkeeper_grpc.rb
-homepage: https://github.com/Misenko/cloudkeeper-one
+homepage: https://github.com/the-cloudkeeper-project/cloudkeeper-one
 licenses:
 - Apache License, Version 2.0
 metadata: {}