cloudkeeper 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3b7552e766ed9dff94b3c02ead5b2d7457146d7
-  data.tar.gz: 9fc5d03ddd65bd5502b9bbf7cfa716c5e5f17306
+  metadata.gz: 8308dade657b0c7205133fee005a1654ed07cc22
+  data.tar.gz: 77717083b5aa925c8918604db8e2ec1206f15c71
 SHA512:
-  metadata.gz: 0a9273fe7503544dd2ed1749d577fbf49a8db35a7b6a9dc4f71230109000bf7e302d9b5c8050a955515b105af0dbcb48fc23a8923b06f3f4f9631cce3a020cae
-  data.tar.gz: 69ee71cc79f047eeb8efb5a80c512285feca404c2047c178d00d563fc57aab294ba7db8873ece88cf038e966167f466ce295e783d366750801bf7e719ac56eb1
+  metadata.gz: 6ce76c74fddd2924369baf8c96d8f6a476110c817524e97899c8d5593e1d0d6c194f02ad05c702057b9c18186d85657304b4dd5b86cd2284d4738fb73355dd17
+  data.tar.gz: af8b5f351291bcae870976c19ae2fb7101719de76faf0ce7f2dbba67d6a796f4862d1b03b74f264f54f1b1bf5e350ef2973f66e3c553eb0d629f36c1aa88517c

data/README.md

@@ -16,7 +16,7 @@ Currently supported image formats are:
 * OVA
 
 ## How does cloudkeeper work?
-cloudkeeper communicates with cloud specific components via [gRPC](http://www.grpc.io/) communication framework to manage individual clouds. 
+cloudkeeper communicates with cloud specific components via [gRPC](http://www.grpc.io/) communication framework to manage individual clouds.
 
 Currently supported clouds:
 * [OpenNebula](https://opennebula.org/) - component [cloudkeeper-one](https://github.com/the-cloudkeeper-project/cloudkeeper-one)
@@ -111,6 +111,8 @@ Options:
                                                    # Possible values: DEBUG, INFO, WARN, ERROR, FATAL, UNKNOWN
   [--logging-file=LOGGING-FILE]                    # File to write logs to
                                                    # Default: /var/log/cloudkeeper/cloudkeeper.log
+  --lock-file=LOCK-FILE                            # File used to ensure only one running instance of cloudkeeper
+                                                   # Default: /var/lock/cloudkeeper/cloudkeeper.lock
   [--debug], [--no-debug]                          # Runs cloudkeeper in debug mode
 ```
 

data/cloudkeeper.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cloudkeeper/version'
@@ -11,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Synchronize cloud appliances between AppDB and cloud platforms'
   spec.description   = 'Synchronize cloud appliances between AppDB and cloud platforms'
-  spec.homepage      = 'https://github.com/Misenko/cloudkeeper'
+  spec.homepage      = 'https://github.com/the-cloudkeeper-project/cloudkeeper'
   spec.license       = 'Apache License, Version 2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -21,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 11.2'
   spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'rubocop', '~> 0.42'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.7'
+  spec.add_development_dependency 'rubocop', '~> 0.48'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.15'
   spec.add_development_dependency 'rspec-collection_matchers', '~> 1.1'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'pry', '~> 0.10'

data/config/cloudkeeper.yml

@@ -24,4 +24,5 @@ cloudkeeper:
   logging:
     level: ERROR # Logging level
     file: /var/log/cloudkeeper/cloudkeeper.log # File to write log to. To turn off file logging leave this field empty.
+  lock-file: /var/lock/cloudkeeper/cloudkeeper.lock # File used to ensure only one running instance of cloudkeeper
   debug: false # Debug mode

data/examples/etc/cron.d/cloudkeeper

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,63 @@
+#!/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`
+
+start() {
+    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

data/lib/cloudkeeper/cli.rb

@@ -12,6 +12,11 @@ module Cloudkeeper
                  default: Cloudkeeper::Settings['logging']['file'],
                  type: :string,
                  desc: 'File to write logs to'
+    class_option :'lock-file',
+                 default: Cloudkeeper::Settings['lock-file'],
+                 required: true,
+                 type: :string,
+                 desc: 'File used to ensure only one running instance of cloudkeeper'
     class_option :debug,
                  default: Cloudkeeper::Settings['debug'],
                  type: :boolean,
@@ -102,7 +107,11 @@ module Cloudkeeper
     desc 'sync', 'Runs synchronization process'
     def sync
       initialize_sync options
-      Cloudkeeper::Managers::ApplianceManager.new.synchronize_appliances
+      File.open(Cloudkeeper::Settings[:'lock-file'], File::RDWR | File::CREAT, 0o644) do |file|
+        lock = file.flock(File::LOCK_EX | File::LOCK_NB)
+        Cloudkeeper::Managers::ApplianceManager.new.synchronize_appliances if lock
+        abort 'cloudkeeper instance is already running, quitting' unless lock
+      end
     rescue Cloudkeeper::Errors::InvalidConfigurationError => ex
       abort ex.message
     end
@@ -130,11 +139,11 @@ module Cloudkeeper
 
     def validate_configuration!
       validate_configuration_group! :authentication,
-                                    [:certificate, :key, :'backend-certificate'],
+                                    %i(certificate key backend-certificate),
                                     'Authentication configuration missing'
       validate_configuration_group! :'remote-mode',
-                                    [:'nginx-binary', :'nginx-error-log-file', :'nginx-access-log-file', :'nginx-pid-file',
-                                     :'nginx-ip-address', :'nginx-min-port', :'nginx-max-port'],
+                                    %i(nginx-binary nginx-error-log-file nginx-access-log-file nginx-pid-file
+                                       nginx-ip-address nginx-min-port nginx-max-port),
                                     'NGINX configuration missing'
     end
 

data/lib/cloudkeeper/entities/appliance.rb

@@ -4,7 +4,7 @@ module Cloudkeeper
       attr_accessor :identifier, :description, :mpuri, :title, :group, :ram, :core, :version, :architecture
       attr_accessor :operating_system, :image, :attributes, :vo, :expiration_date, :image_list_identifier
 
-      REJECTED_ATTRIBUTES = [:vo, :expiration, :image_list_identifier].freeze
+      REJECTED_ATTRIBUTES = %i(vo expiration image_list_identifier).freeze
 
       def initialize(identifier, mpuri, vo, expiration_date, image_list_identifier, title = '', description = '', group = '',
                      ram = 1024, core = 1, version = '', architecture = '', operating_system = '', image = nil, attributes = {})

data/lib/cloudkeeper/entities/convertables/convertable.rb

@@ -4,7 +4,7 @@ module Cloudkeeper
   module Entities
     module Convertables
       module Convertable
-        CONVERT_OUTPUT_FORMATS = [:raw, :qcow2, :vmdk].freeze
+        CONVERT_OUTPUT_FORMATS = %i(raw qcow2 vmdk).freeze
 
         def self.convert_output_formats
           CONVERT_OUTPUT_FORMATS

data/lib/cloudkeeper/entities/convertables/ova.rb

@@ -2,7 +2,7 @@ module Cloudkeeper
   module Entities
     module Convertables
       module Ova
-        CONVERT_OUTPUT_FORMATS = [:raw, :qcow2].freeze
+        CONVERT_OUTPUT_FORMATS = %i(raw qcow2).freeze
 
         def self.convert_output_formats
           CONVERT_OUTPUT_FORMATS

data/lib/cloudkeeper/managers/image_manager.rb

@@ -68,8 +68,8 @@ module Cloudkeeper
               open(filename, 'w') { |file| response.read_body { |chunk| file.write(chunk) } }
             end
           end
-        rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, EOFError, Net::HTTPBadResponse,
-               Net::HTTPServerException, Net::HTTPHeaderSyntaxError, Net::ProtocolError => ex
+        rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::HTTPBadResponse,
+               Net::HTTPHeaderSyntaxError, EOFError, Net::HTTPServerException => ex
           raise Cloudkeeper::Errors::NetworkConnectionError, ex
         end
 

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.42'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -325,6 +325,8 @@ files:
 - bin/cloudkeeper
 - cloudkeeper.gemspec
 - config/cloudkeeper.yml
+- examples/etc/cron.d/cloudkeeper
+- examples/etc/init.d/cloudkeeper-cron
 - lib/cloudkeeper.rb
 - lib/cloudkeeper/backend_connector.rb
 - lib/cloudkeeper/cli.rb
@@ -389,7 +391,7 @@ files:
 - lib/cloudkeeper/utils/url.rb
 - lib/cloudkeeper/version.rb
 - lib/cloudkeeper_grpc.rb
-homepage: https://github.com/Misenko/cloudkeeper
+homepage: https://github.com/the-cloudkeeper-project/cloudkeeper
 licenses:
 - Apache License, Version 2.0
 metadata: {}