cloudkeeper 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c6230319495e64370c48ade72d90d2b43ce0e5e
-  data.tar.gz: dfc5256e110fe7cd8098f64271ace0a193e7a607
+  metadata.gz: 20cfc2b81c1b5aef7d0d889525fddf6685898cec
+  data.tar.gz: f0950b52a30ebf45f36057b71d1f26f8677565be
 SHA512:
-  metadata.gz: 430fd633d0d538fcfc488ed6d83b7ef3121de74fd0a5a3a90d43dca7309a34fe04e05a841a3cf1f4651a7e8d7262618444445823f50c96f9d2b875d373a59417
-  data.tar.gz: f38f6430d1c203d08c31298a2409acfe3ccb360dc967e2cbf40fffb6585f09b2d67c3e53c08ba5242b5f966df99e7dda1907b39cdb97acb89f0788cb9c9f9515
+  metadata.gz: a34479892bbc6f97f804513b5b7043fbe0b5361f2e1c2d9408d87d8bbdd4ac6b6761a52238311d8d988f1f07bba25d2429b5908059eb350992df104809f31c97
+  data.tar.gz: a8e3ddede8e0615b298f1cd873f70a860fbd132e921cf7ecd917196cf50d6970c09a4041498cd547e2f8c30adb3d82bc77483c1ba21079c9cce6b343d6b06c28

data/examples/systemd/cloudkeeper.service

@@ -0,0 +1,18 @@
+[Unit]
+Description="Cloudkeeper Oneshot Service"
+After=network.target
+
+[Service]
+Type=oneshot
+
+User=cloudkeeper
+Group=cloudkeeper
+PermissionsStartOnly=true
+
+ExecStartPre=/bin/mkdir -p /var/run/cloudkeeper /var/lock/cloudkeeper /var/spool/cloudkeeper/images /var/log/cloudkeeper
+ExecStartPre=/bin/chown -R cloudkeeper:cloudkeeper /var/run/cloudkeeper /var/lock/cloudkeeper /var/spool/cloudkeeper /var/log/cloudkeeper
+
+ExecStart=/usr/bin/cloudkeeper
+
+[Install]
+WantedBy=multi-user.target

data/examples/systemd/cloudkeeper.timer

@@ -0,0 +1,9 @@
+[Unit]
+Description=Run Cloudkeeper every 2 hours and 15 minutes after boot
+
+[Timer]
+OnBootSec=15min
+OnUnitActiveSec=2h 
+
+[Install]
+WantedBy=timers.target

data/lib/cloudkeeper/managers/image_manager.rb

@@ -58,7 +58,7 @@ module Cloudkeeper
                                                File.size(filename), true
         rescue Cloudkeeper::Errors::InvalidURLError, Cloudkeeper::Errors::Image::Format::RecognitionError,
                Cloudkeeper::Errors::ArgumentError, Cloudkeeper::Errors::NetworkConnectionError, ::IOError => ex
-          raise Cloudkeeper::Errors::Image::DownloadError, ex
+          raise Cloudkeeper::Errors::Image::DownloadError, "Image #{url.inspect} download error: #{ex.message}"
         end
 
         def retrieve_image(uri, filename)

data/lib/cloudkeeper/utils/appliance.rb

@@ -53,7 +53,7 @@ module Cloudkeeper
         appliance.image.add_image_file image_file.send("to_#{format}".to_sym)
       rescue Cloudkeeper::Errors::Image::Format::NoRequiredFormatAvailableError, Cloudkeeper::Errors::CommandExecutionError,
              Cloudkeeper::Errors::ArgumentError, ::IOError => ex
-        raise Cloudkeeper::Errors::Image::ConversionError, ex
+        raise Cloudkeeper::Errors::Image::ConversionError, "Image #{appliance.image.uri.inspect} conversion error: #{ex.message}"
       end
     end
   end

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -339,8 +339,8 @@ files:
 - bin/cloudkeeper
 - cloudkeeper.gemspec
 - config/cloudkeeper.yml
-- examples/etc/cron.d/cloudkeeper
-- examples/etc/init.d/cloudkeeper-cron
+- examples/systemd/cloudkeeper.service
+- examples/systemd/cloudkeeper.timer
 - lib/cloudkeeper.rb
 - lib/cloudkeeper/backend_connector.rb
 - lib/cloudkeeper/cli.rb

data/examples/etc/cron.d/cloudkeeper

@@ -1,11 +0,0 @@
-# Cron job running by default every two hours.
-# The lock file can be enabled or disabled via:
-#
-#  service cloudkeeper-cron start
-#  chkconfig cloudkeeper-cron on
-#
-# Note that the lock file not existing is a success (and
-# over-all success is needed in order to prevent error
-# messages from cron).
-
-30 */2 * * *	cloudkeeper	[ ! -f /var/lock/cloudkeeper-cron ] || /usr/bin/cloudkeeper

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

@@ -1,73 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          cloudkeeper-cron
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Enable periodic run of cloudkeeper
-# Description:       This shell script enables the automatic use of cloudkeeper
-### END INIT INFO
-
-lockfile="/var/lock/cloudkeeper-cron"
-retval=0
-name=`basename $0`
-
-run_dir="/var/run/cloudkeeper"
-lock_dir="/var/lock/cloudkeeper"
-user="cloudkeeper"
-
-setup_dirs() {
-    mkdir -p "$run_dir" "$lock_dir"
-    chown "$user":"$user" "$run_dir" "$lock_dir"
-}
-
-start() {
-    setup_dirs
-    touch $lockfile
-    echo "Enabling periodic $name"
-    retval=0
-}
-
-stop() {
-    rm -f $lockfile
-    echo "Disabling periodic $name"
-    retval=0
-}
-
-restart() {
-    stop
-    start
-}
-
-case "$1" in
-    start)
-    start
-    ;;
-    stop)
-    stop
-    ;;
-    restart|force-reload)
-    restart
-    ;;
-    reload)
-    ;;
-    condrestart)
-    [ -f "$lockfile" ] && restart
-    ;;
-    status)
-    if [ -f "$lockfile" ] ; then
-        echo "Periodic $name is enabled"
-        retval=0
-    else
-        echo "Periodic $name is disabled"
-        retval=3
-    fi
-    ;;
-    *)
-    echo "Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
-    retval=1
-esac
-
-exit $retval