nifty 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34535f6d35b3c8a655fd2e09ba345bed53776e33
-  data.tar.gz: 3da0882d184d3100c510ad0586c0b38c8adb9b7d
+  metadata.gz: 20ccc2cf0a1d6ba0b26e0a5bcdb893436e244bd3
+  data.tar.gz: b4926f2fb82bc8d69f571186162a650ae0904744
 SHA512:
-  metadata.gz: fdaeac11c89d829767d745b7e33f5290cf02bd9a243fd24a637303d8c8bf79270d94a8a8b5f64236bfa444ca0463c6396eca4ca6c6356bcbc54afc890578c532
-  data.tar.gz: a6d550cf0e9c89b9bfebe07c971892bdee2af05c3479485c33fa0d4597df41839ebdb84d01c10bb9f0ea0b31e8af6eba4f4583d798f1e9be222f964536b065f7
+  metadata.gz: 45c91c2a17ec5d818194b7e6a794cc4722a8d189d734eee98ab8cc8860b671b556014432512435477a20ce6006ca0346e0789a73e54e73893b25fb8db0bacbb0
+  data.tar.gz: 3bdb417b706e1526938423cbc6d2ca40200b9d2da27270e4d84a3519156cc45c653bd7ef4a6e7e1ef6397828ee06499eff98ba39353376a7c674dcb857fd829f

data/README.md

@@ -96,6 +96,7 @@ Options:
       [--description-naming], [--no-description-naming]  # If true, uses identifier and version from appliance description as template/image name instead of generated uuids
       [--disk-expiration], [--no-disk-expiration]        # Will expire old disks before the new one is registered
       --permissions=PERMISSIONS                          # UNIX-like image and template permissions in OpenNebula
+      [--groups=one two three]                           # Names of groups appliances will be registred to in OpenNebula
   -a, --appliance-dir=APPLIANCE-DIR                      # Directory from where appliance descriptors will be loaded
   -m, --transfer-method=TRANSFER-METHOD                  # Transfer method for image upload
   -t, [--transfer-destination=TRANSFER-DESTINATION]      # Image upload destination

data/config/nifty.yml

@@ -12,6 +12,7 @@ production:
     description-naming: false # If true, uses identifier and version from appliance description as template/image name instead of generated uuids
     disk-expiration: true # Will expire old disks before the new one is registered
     permissions: "640" # UNIX-like image and template permissions in OpenNebula, MUST be a string
+    groups: # Array of groups. If set, groups in appliance descriptor will be ignored and these groups will be used instead
   logging:
     level: ERROR # Logging level
     file: /var/log/nifty/nifty.log # File to write log to. To turn off file logging leave this field empty.

data/lib/nifty/backends/opennebula.rb

@@ -53,6 +53,10 @@ class Nifty::Backends::Opennebula < Nifty::Backend
           :required => true,
           :type => :string,
           :desc => 'UNIX-like image and template permissions in OpenNebula'
+        },
+        :groups => {
+          :type => :array,
+          :desc => 'Names of groups appliances will be registred to in OpenNebula'
         }
       }
     end

data/lib/nifty/events/opennebula/registration_event.rb

@@ -34,7 +34,7 @@ class Nifty::Events::Opennebula::RegistrationEvent < Nifty::Events::Opennebula::
 
     expire_appliance(template_handler, image_handler, appliance, parameters)
 
-    groups = groups(group_handler, appliance)
+    groups = groups(group_handler, appliance, parameters[:groups])
     # due to OpenNebula restrictions appliances have to be registered separately for each datastore and each group
     datastores.each do |datastore|
       groups.each do |group|

data/lib/nifty/events/opennebula/utils/events_common.rb

@@ -16,10 +16,12 @@ module Nifty::Events::Opennebula::Utils::EventsCommon
   #
   # @param [Nifty::Backends::Utils::Opennebula::GroupHandler] group_handler
   # @param [Cloud::Appliance::Descriptor::Appliance] appliance
+  # @param [Array] prior_groups groups from configuration file that if exist will be used instead of the groups in appliance
   # @return [Array] Array of groups
-  def groups(group_handler, appliance)
+  def groups(group_handler, appliance, prior_groups)
     groups = []
-    appliance.groups.each do |group_name|
+    group_names = prior_groups || appliance.groups
+    group_names.each do |group_name|
       group = group_handler.group(group_name)
       fail Nifty::Errors::Backends::Opennebula::ResourceNotFoundError, "No such group with name #{group_name.inspect}" unless group
 

data/lib/nifty/version.rb

@@ -1,3 +1,3 @@
 module Nifty
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifty
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler