rbovirt 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af1cb013363d659b947761e3e38126834c084042
-  data.tar.gz: c4ac3c8988f2951bd0eb99e38a5a4db7e219be60
+  metadata.gz: b05ea53d2175d3207baf62b7da792bca31ad3c86
+  data.tar.gz: 138fccc2e3f1a82ec72b4519a9d6a54d9779eed9
 SHA512:
-  metadata.gz: 46c76b24ab5c95762920ddea7c1a44fee65df4fe951b1a4e1fbc9307d3993178e8f7cf87d63c8e87e9ccf8a7da318905a7b8d10ad80c72e0ca754b8d457fb6fd
-  data.tar.gz: 751efa86aebe75dda8afd43dca666ad23ba1d1958734ff7d9f7715a1c22685ea06387e4f262195d63f02b65ada7b246625099b80c2499656791ec76a4ce04b06
+  metadata.gz: fb395d018101fbc35283b930a10393f751a7d360ce333072150dafd5ad06fb087f70ddbfdbc450efed766c5617e68f7c8459add1b9dd280a0e7587fb1143cebc
+  data.tar.gz: b9fd797133e7d1bf8a95fd025dcadf86d914b8dda8ba838b5881759496352e9b1798a92322aca6d911f771938b039f8427a452cf3958f564c77e37ec00532c85

data/CHANGES.rdoc

@@ -6,6 +6,37 @@ _rbovirt_ project.
 Note that this list of changes was added with the 0.0.30 release,
 previous releases aren't described here.
 
+== 0.1.4
+
+New features:
+
+* Support passing custom script to start_with_cloudinit
+
+Bug fixes:
+
+* Support for multi-line runcmd params
+* RBOVIRT_REST_TIMEOUT parse as integer
+* Pin rack to 1.x
+* Blank template does not contain a <cluster> element
+
+== 0.1.3
+
+New features:
+
+* Add instance_type support for VM
+* Add mtu vlan_id and usages to networks
+* Name servers and search domains should be space separated strings
+
+Bug fixes:
+
+* Name servers and search domains should be passed as space separated strings
+
+== 0.1.2
+
+Bug fixes:
+
+* Explicitly use version 3 of the API
+
 == 0.1.1
 
 New features:

data/Gemfile

@@ -1,2 +1,4 @@
 source "http://rubygems.org"
+# rack 2.0 requires ruby 2.2
+gem "rack", "~> 1.6"
 gemspec

data/lib/ovirt/template.rb

@@ -37,7 +37,9 @@ module OVIRT
       @status = ((xml/'status').first.text rescue 'unknown')
       @memory = (xml/'memory').first.text
       @profile = (xml/'type').first.text
-      @cluster = Link::new(@client, (xml/'cluster').first[:id], (xml/'cluster').first[:href])
+      if (xml/'cluster').first
+        @cluster = Link::new(@client, (xml/'cluster').first[:id], (xml/'cluster').first[:href])
+      end
       @display = {
         :type => ((xml/'display/type').first.text rescue ''),
         :monitors => ((xml/'display/monitors').first.text rescue 0)

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module OVIRT
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/ovirt/vm.rb

@@ -162,26 +162,23 @@ module OVIRT
       runcmd              = opts[:runcmd]
       cluster_major, cluster_minor = opts[:cluster_version]
       api_major,api_minor, api_build, api_revision = opts[:api_version]
-      extracmd            = nil 
+      extracmd            = opts[:custom_script]
       unless opts[:phone_home].nil?
         phone_home = \
         "phone_home:\n" \
         "  url: #{opts[:phone_home]['url']}\n" \
         "  post: #{opts[:phone_home]['post']}\n"
-        extracmd   = phone_home
+        extracmd = "#{extracmd}#{phone_home}"
       end
-      cmdlist             = 'runcmd:'
+      cmdlist = 'runcmd:'
       unless runcmd.nil?
         runcmd.each do |cmd|
           cmdlist = \
-	  "#{cmdlist}\n" \
-          "- #{cmd}\n"
-        end
-        if extracmd.nil?
-          extracmd = cmdlist
-        else
-          extracmd = extracmd +cmdlist
+          "#{cmdlist}\n" \
+          "- |\n"\
+          "  #{cmd.lines.join("  ")}\n"
         end
+        extracmd   = "#{extracmd}#{cmdlist}"
       end
       builder   = Nokogiri::XML::Builder.new do
         action {
@@ -204,12 +201,7 @@ module OVIRT
           end
           vm {
             initialization {
-              unless runcmd.nil?
-                custom_script cmdlist
-              end
-              unless phone_home.nil?
-                custom_script phone_home
-              end
+              custom_script extracmd if extracmd
               cloud_init {
                 unless hostname.nil?
                   host { address hostname  }

data/lib/rbovirt.rb

@@ -172,7 +172,7 @@ module OVIRT
         options[:ssl_cert_store] = ca_cert_store if ca_cert_store
         options[:ssl_ca_file] = ca_cert_file if ca_cert_file
       end
-      options[:timeout] = ENV['RBOVIRT_REST_TIMEOUT'] if ENV['RBOVIRT_REST_TIMEOUT']
+      options[:timeout] = ENV['RBOVIRT_REST_TIMEOUT'].to_i if ENV['RBOVIRT_REST_TIMEOUT']
       RestClient::Resource.new(@api_entrypoint, options)[suburl]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbovirt
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Amos Benari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri