opennebula-provider 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 49b1bfa4c57497eb862f4c254690c6786fd24e4b
-  data.tar.gz: a63abfc6557857d31e7fb89f8c0c67073f6ffa24
+SHA256:
+  metadata.gz: b5b88a415e6330b47432be7022d12d24f4bca59799d3bf4746b60208371be8a9
+  data.tar.gz: 1270ab6c8c001c34c8ce3b707d3463a3f3d3af8898b294a95c6ef3290e211920
 SHA512:
-  metadata.gz: 5c6b8dcc034d9b7080799dd8971fc6133ed776786aeb4cea10aa54ccf509db6c8fc1210fa199f2954ed773e640838a97fad21ae2e8bd073323a89097b7809829
-  data.tar.gz: 8cba4aff7c9a7559bb5440c7953084edf9a61efc3899cbefb492342ca30204bf91a679479faacc2645e1c003271f1498db98cb2aa05c7da60a46f1e41851edce
+  metadata.gz: de86780506fd534600d0fa456fa5e7d5f1149d4726328b400e26f690ea259400e04345962e7843e5beca91b5dd98f30cf3409274aa61a7c586f354335690189f
+  data.tar.gz: 5e49c690580ca776806c396bbee2856884e351dae4903107b1f7804e70a2f32b9947e70a29fa9eb372010c7d6da5755d60800459a461f2fd3a1598d5064641a9

data/README.md

@@ -20,10 +20,6 @@ $ vagrant up --provider=opennebula
 ...
 ```
 
-## Box Format
-
-TODO: Write box format creation instruction here.
-
 ## Usage
 
 ```
@@ -35,7 +31,7 @@ Vagrant.configure("2") do |config|
     one.username = 'YOUR NAME'
     one.password = 'YOUR PASSWORD'
     one.template_id = 123
-    one.title = 'my vm'
+    one.title = 'my-vm'
   end
 end
 ```
@@ -51,6 +47,7 @@ end
 * `memory` - An instance memory in MB
 * `cpu` - An instance cpus
 * `vcpu` - An instance virtual cpus
+* `disk_size` - Disk size, in MB, for templates with ONLY one disk
 
 You can use `template_name` parameters instead `template_id` to define template by name and if there are multiple templates with the same name will be used the most recent. 
 

data/lib/opennebula-provider/config.rb

@@ -14,6 +14,7 @@ module VagrantPlugins
       attr_accessor :memory
       attr_accessor :cpu
       attr_accessor :vcpu
+      attr_accessor :disk_size
 
       def initialize
         @endpoint = ENV['ONE_XMLRPC'] || ENV['ONE_ENDPOINT'] || UNSET_VALUE
@@ -28,6 +29,7 @@ module VagrantPlugins
         @memory = UNSET_VALUE
         @cpu = UNSET_VALUE
         @vcpu = UNSET_VALUE
+        @disk_size = UNSET_VALUE
       end
 
       def finalize!
@@ -52,6 +54,7 @@ module VagrantPlugins
         if @cpu && ! @vcpu
           @vcpu = @cpu
         end
+        @disk_size = nil if @disk_size == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/opennebula-provider/helpers/fog.rb

@@ -58,6 +58,18 @@ module VagrantPlugins
           newvm.flavor.memory = @provider_config.memory unless @provider_config.memory.nil?
           newvm.flavor.cpu = @provider_config.cpu unless @provider_config.cpu.nil?
           newvm.flavor.vcpu = @provider_config.vcpu unless @provider_config.vcpu.nil?
+
+          if newvm.flavor.disk.instance_of? Array
+            fail Errors::AllocateError, error: I18n.t(
+                'opennebula_provider.errors.allocate',
+                error: 'Template has more than one disk attached and `disk_size` ' +
+                       'feature is supported only for templates with only one')
+          end
+
+          if @provider_config.disk_size != nil
+            newvm.flavor.disk["size"] = @provider_config.disk_size
+          end
+          @logger.warn "Deploying VM with options #{newvm.flavor.inspect}"
           vm = newvm.save
           vm.id
         rescue RuntimeError => e
@@ -115,7 +127,7 @@ module VagrantPlugins
           case state
           when 'LCM_INIT'
             case status
-            when 1
+            when 1, 3
               pretty = 'pending'
             when 4
               pretty = 'stopped'

data/lib/opennebula-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenNebulaProvider
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-provider
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Cherdancev Evgeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -28,22 +28,22 @@ dependencies:
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.38'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.38.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.38'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.38.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.38'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: OpenNebula provider for Vagrant