nifty 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e937c870bd341d68c0d82e95f2e0e2817241354b
-  data.tar.gz: 771d88a6857eae41a2fc90f94ca311c9be6ff862
+  metadata.gz: da06809a0d103dea0a5455df408602e66d73c185
+  data.tar.gz: 3ee9e2867cd51f105302f6680e6ac79cddf0a20b
 SHA512:
-  metadata.gz: 4aa1d442d66c1c75dcf81c2ff822d186ba36a7893aa69a3bff9e392853e30f8a2c1ccf3168d5c61240b02aa55f3422cae36e6e7abb66be0591445ea7fce732fe
-  data.tar.gz: a4c85fa18d6b3b1cf17b6a4353f869081cee188ff4fda53ec8af194989a94eed3a0cbf1d1734addaeb563b39517f49c7d7c82b97bc1663ddbed83ceaf1fced1f
+  metadata.gz: 34f8471c151ee40e16098847dad9de49b0607927d1a1b6ff8d845eabb5cce852fa1b7bd9dfd36f7909cd3f9177fa306241842f03642a028109afeb929bb14abe
+  data.tar.gz: 4206e4b064191fe2a80d794dd443f7b5971a56e3cda04e2bb6309b8ddce7f3d2f314b13fa7f97d584fc482147a41e46132fb74e584acdf9bd9f9cb89cbd4bf3e

data/README.md

@@ -22,7 +22,17 @@ NIFTY cooperates with two other tools [COMFY](https://github.com/CESNET/comfy) a
 
 ## Installation
 ###From distribution specific packages
-Omnibus packaging for NIFTY will be available soon. Meanwhile, use one of other installation methods.
+Distribution specific packages can be created with [omnibus packaging for NIFTY](https://github.com/CESNET/omnibus-nifty). When installing via packages you don't have to install neither ruby nor rubygems. Packages contain embedded ruby and all the necessary gems and libraries witch will not effect your system ruby, gems and libraries.
+
+Currently supported distributions:
+
+    Ubuntu 12.04
+    Ubuntu 14.04
+    Debian 7.6
+    Debian 8.2
+    CentOS 6.5
+    CentOS 7.1
+
 
 ###From RubyGems.org
 To install the most recent stable version
@@ -55,7 +65,7 @@ three locations:
 * `/etc/nifty/nifty.yml`
 * `PATH_TO_GEM_DIR/config/nifty.yml`
 
-The example configuration file can be found at the last location
+The default configuration file can be found at the last location
 `PATH_TO_GEM_DIR/config/nifty.yml`.
 
 ##Usage
@@ -67,7 +77,8 @@ Commands:
   nifty backends                                                                                                                                           # Lists all available backends with their description
   nifty help [COMMAND]                                                                                                                                     # Describe available commands or one specific command
   nifty opennebula --api-call-timeout=API-CALL-TIMEOUT --expiration-interval=EXPIRATION-INTERVAL --permissions=PERMISSIONS -d, --datastores=one two three  # Runs NIFTY with backend opennebula
-  nifty opennebula-transfer-methods                                                                                                                        # Lists all available transfer methods with their description for "...
+  nifty opennebula-migrate --api-call-timeout=API-CALL-TIMEOUT                                                                                             # Prepares "opennebula" for integration with NIFTY
+  nifty opennebula-transfer-methods                                                                                                                        # Lists all available transfer methods with their description for "opennebula" backend
   nifty version                                                                                                                                            # Prints NIFTY's version
 
 Options:

data/config/templates/image.erb

@@ -32,7 +32,3 @@ BUS = "<%= disk.target %>"
 <% if disk.format %>
 DRIVER = "<%= disk.format %>"
 <% end %>
-
-<% appliance.attributes.each do |key, value| %>
-<%= key %> = "<%= value %>"
-<% end %>

data/config/templates/template.erb

@@ -20,7 +20,3 @@ IMAGE = "<%= name %>",
 IMAGE_UNAME = "<%= username %>"
 ]
 <% end %>
-
-<% appliance.attributes.each do |key, value| %>
-<%= key %> = "<%= value %>"
-<% end %>

data/lib/nifty/backends/opennebula.rb

@@ -11,6 +11,7 @@ class Nifty::Backends::Opennebula < Nifty::Backend
   VMCATCHER_APPLIANCE_OS_ARCH = 'VMCATCHER_EVENT_SL_ARCH'
   VMCATCHER_APPLIANCE_OS_DISTRIBUTION = 'VMCATCHER_EVENT_SL_OS'
   VMCATCHER_APPLIANCE_OS_VERSION = 'VMCATCHER_EVENT_SL_OSVERSION'
+  VMCATCHER_PREFIX = 'VMCATCHER_'
 
   class << self
     # @see Nifty::Backend#backend?
@@ -132,11 +133,16 @@ class Nifty::Backends::Opennebula < Nifty::Backend
         appliance.title = image["TEMPLATE/#{VMCATCHER_APPLIANCE_TITLE}"]
         appliance.description = image["TEMPLATE/#{VMCATCHER_APPLIANCE_DESCRIPTION}"]
 
+        vmcatcher_attributes = {}
+        image.to_hash['IMAGE']['TEMPLATE'].each_pair { |k,v| vmcatcher_attributes[k] = v if k.start_with? VMCATCHER_PREFIX }
+
         image_template = Tilt::ERBTemplate.new(File.join(Nifty::GEM_DIR, 'templates', 'image.erb'))
         image_template_update = image_template.render(Object.new, {name: image_name, appliance: appliance})
         logger.debug("Updating image template for image #{image_name}")
         Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.update(image_template_update, true) }
 
+        appliance.attributes = vmcatcher_attributes
+
         logger.debug("Looking for templates with image #{image_name}...")
         template_handler.unmanaged_templates_with_image(image_name).each do |template|
           template_name = template.name

data/lib/nifty/version.rb

@@ -1,3 +1,3 @@
 module Nifty
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/templates/image.erb

@@ -1,4 +1,8 @@
 
+<% appliance.attributes.each do |key, value| %>
+<%= key %> = "<%= value %>"
+<% end %>
+
 NIFTY_ID = "<%= name %>"
 NIFTY_VERSION = "<%= Nifty::VERSION %>"
 NIFTY_APPLIANCE_ID = "<%= appliance.identifier %>"

data/templates/template.erb

@@ -1,4 +1,8 @@
 
+<% appliance.attributes.each do |key, value| %>
+<%= key %> = "<%= value %>"
+<% end %>
+
 NIFTY_ID = "<%= name %>"
 NIFTY_VERSION = "<%= Nifty::VERSION %>"
 NIFTY_APPLIANCE_ID = "<%= appliance.identifier %>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifty
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler