cloudkeeper-one 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142698a5fff9551e770ba001dad66d3ff35520d1
-  data.tar.gz: 8bf86665e5fb279459dc7076c8fff53dd5afb1cd
+  metadata.gz: dbc48a405520c660028cc35656d0dd47ff17ac45
+  data.tar.gz: c422f0474a07032eedecff64b8348c6c2f2570bf
 SHA512:
-  metadata.gz: 512eae371eb0df6f7ec7161098fe2b249596469ec8fbe329b586527a6877dbb73e64039638ca0b6751775505496268641d7c2b1b24035cfbd5c42d5e6d965939
-  data.tar.gz: 41028929c4f8bbb713315292d6161325a50895279f9988072d59bd3acc386a29dc0a8f03985c8ef79b106499bec71b5c4482ac3628c6bfc803982b36f922acff
+  metadata.gz: d2be7e38e80e4a22e5b90768ed1c26dbf4d13e3708b995a8cc037496c68a39dd3678bf1b0aaf891e75372900016dcb55a111154deab09ad05b4a731207b8e98b
+  data.tar.gz: a77fbd53adc364eaeb7a136fce354a5b2c0d2a6596ac1e131def6ec53cf237afd842e44caa5f2c117b17d460914d66d247d7fdbf0a65d3ced4911e800d40b2dc

data/cloudkeeper-one.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cloudkeeper/one/version'
 

data/examples/systemd/cloudkeeper-one.service

@@ -0,0 +1,18 @@
+[Unit]
+Description="Cloudkeeper-one gRPC Service"
+After=network.target
+
+[Service]
+Type=simple
+User=cloudkeeper-one
+Group=cloudkeeper-one
+PermissionsStartOnly=true
+Restart=always
+
+ExecStartPre=/bin/mkdir -p /var/run/cloudkeeper-one /var/lock/cloudkeeper-one /var/log/cloudkeeper-one /var/spool/cloudkeeper-one/appliances
+ExecStartPre=/bin/chown -R cloudkeeper-one:cloudkeeper-one /var/run/cloudkeeper-one /var/lock/cloudkeeper-one /var/log/cloudkeeper-one /var/spool/cloudkeeper-one
+
+ExecStart="/opt/cloudkeeper-one/bin/cloudkeeper-one"
+
+[Install]
+WantedBy=multi-user.target

data/lib/cloudkeeper/one/appliance_actions/utils/image_download.rb

@@ -27,7 +27,7 @@ module Cloudkeeper
 
               http.request(request) do |response|
                 response.value
-                open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
+                File.open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
               end
             end
             logger.debug "Image stored into #{filename}"

data/lib/cloudkeeper/one/opennebula/image_handler.rb

@@ -84,7 +84,10 @@ module Cloudkeeper
 
           timeout do
             until ready? image
-              raise Cloudkeeper::One::Errors::Opennebula::ResourceStateError, image['TEMPLATE/ERROR'] if error? image
+              if error? image
+                delete image
+                raise Cloudkeeper::One::Errors::Opennebula::ResourceStateError, image['TEMPLATE/ERROR']
+              end
               sleep(Cloudkeeper::One::Opennebula::Handler::API_POLLING_WAIT)
             end
           end

data/lib/cloudkeeper/one/version.rb

@@ -1,5 +1,5 @@
 module Cloudkeeper
   module One
-    VERSION = '1.3.0'.freeze
+    VERSION = '1.3.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper-one
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -327,7 +327,7 @@ files:
 - config/cloudkeeper-one.yml
 - config/templates/image.erb
 - config/templates/template.erb
-- examples/etc/init.d/cloudkeeper-one
+- examples/systemd/cloudkeeper-one.service
 - lib/cloudkeeper/one.rb
 - lib/cloudkeeper/one/appliance_actions.rb
 - lib/cloudkeeper/one/appliance_actions/discard.rb

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

@@ -1,132 +0,0 @@
-#!/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"
-lock_dir="/var/lock/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"
-}
-
-setup_dirs() {
-    mkdir -p "$run_dir" "$lock_dir"
-    chown "$user":"$user" "$run_dir" "$lock_dir"
-}
-
-is_running() {
-    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
-}
-
-start() {
-    if is_running; then
-        echo "Already started"
-    else
-        echo "Starting $name ..."
-        setup_dirs
-
-        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 -s TERM `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 -s KILL `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