opennebula-provider 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d7cb6962f3a15c06a587d0facb4dfb8d9fc0b920
-  data.tar.gz: 3c5e3590dcff842f5c8c39e19cc10120f90a0c85
+SHA256:
+  metadata.gz: 8b60bec9aff9387371b4006a6ba193d70b44eb8fa5aaadbf1a2ea29703828642
+  data.tar.gz: 4b1d957117ed361204089545653af7f652612587384ee1540acf07275e6d152b
 SHA512:
-  metadata.gz: 4927b9168112e605ef83f8708877589e257f462b40a91dc9361f35019d90b13e95910142b1e808618514a741b114d6a6d806b514232f43e2832f68707252a17e
-  data.tar.gz: 9d02b553bc764ecbe055e1276d6614ee32171178ccc5459d7b1cfa31d591f9d7deef853e3ca89996e5e9df8c040e08623d17d92171c2abddef36679fd5acd2f0
+  metadata.gz: 4938bff37a014c11dd8c6f5e42f4a5367ef9d76ccde6d06e63e9447e7373ce65cd3df16fe7e977055e32928b3f81c33c4ee3710daab54b67025ef742adf0effe
+  data.tar.gz: e805d5117d6917173af079da36c044f95b60339ee4a932517c34fc8db7a7bcfe91472442d38d4f5dfd7eb6b0352fd883e13165f022a793e91a84c614a3629fec

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
 ```
@@ -46,10 +42,14 @@ end
 * `username` - OpenNebula username
 * `password` - OpenNebula password
 * `template_id` - OpenNebula template id
+* `template_name` - OpenNebula template name
 * `title` - OpenNebula instance name
 * `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. 
 
 You can use ONE_USER, ONE_PASSWORD, ONE_XMLRPC (or ONE_ENDPOINT) environment variables
 instead of defining it in Vagrantfile.

data/lib/opennebula-provider/action/read_ssh_info.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
           driver = machine.provider.driver
 
           host = driver.ssh_info(machine.id)
-          { host: host, port: 22 }
+          { host: host, port: 22 } unless host.nil?
         end
       end
     end

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

@@ -41,7 +41,11 @@ module VagrantPlugins
           if @provider_config.template_id
             newvm.flavor = @fog_client.flavors.get @provider_config.template_id
           elsif @provider_config.template_name
-            newvm.flavor = @fog_client.flavors.get_by_filter({name: @provider_config.template_name})
+            flavors = @fog_client.flavors.get_by_filter({name: @provider_config.template_name})
+            if flavors.nil?
+              fail Errors::ComputeError, error: I18n.t('opennebula_provider.compute.template_missing', template: @provider_config.template_name)
+            end
+            newvm.flavor = flavors.last
           end
           if newvm.flavor.nil?
             fail Errors::ComputeError, error: I18n.t('opennebula_provider.compute.template_missing', template: @provider_config.template)
@@ -54,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
@@ -102,7 +118,7 @@ module VagrantPlugins
 
         def ssh_info(id)
           desc = @fog_client.servers.get(id)
-          desc.ip
+          desc.ip unless desc.nil?
         end
 
         private
@@ -111,7 +127,7 @@ module VagrantPlugins
           case state
           when 'LCM_INIT'
             case status
-            when 1
+            when 1, 3
               pretty = 'pending'
             when 4
               pretty = 'stopped'
@@ -120,7 +136,7 @@ module VagrantPlugins
             when 7
               pretty = 'error'
             end
-          when 'PROLOG'
+          when 'PROLOG', 'PROLOG_RESUME'
             case status
             when 3
               pretty = 'prolog'

data/lib/opennebula-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenNebulaProvider
-    VERSION = '1.1.0'
+    VERSION = '1.1.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-provider
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Cherdancev Evgeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -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.1.2
 signing_key: 
 specification_version: 4
 summary: OpenNebula provider for Vagrant