vagrant-vultr 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06699707d0c31e1450add468610079af676f8a7f
-  data.tar.gz: 19d7419495dc8ad6d24db33d0575efff3664e6ef
+SHA256:
+  metadata.gz: f031591283dd35a1683006af1dd65ba484f3dbf36da051a79b1f55f085779f3b
+  data.tar.gz: da874ed72a35b7d49e97e6b2772e41bf128b1fe3fbdd7dc9cf2dee2dad85af02
 SHA512:
-  metadata.gz: 434620039d7eb47ad9284535959180a96dcc124ae71d3ddcc92fdb74eac74b989b36d352e2ac888d98a29a38db08dcca2c060e7994ab996335c7f2725d6db898
-  data.tar.gz: 66c896a4398afe911e7e825f89b80264d9c04ed3a9c60525605b4467c38c720b0c98d311d9c24eb8f3f8bd932491d8bf03c32aba4ba1dc7db81ac86f43fe4e56
+  metadata.gz: b730e9e7ec7709d135bb5e21edafafb30ef5d8160630e3b82886672eab78967c138bba426ae1715393063ee2fdcb472a13747820e5ccd0d14f99cdecdcb6e67d
+  data.tar.gz: e2f9b4604aa5eead4e9c353895aade2a1c7179d4a0e20708d70e0925d08b25a05b91539ae4c3cd8e608235befdfc5190028f0900806015e31aea1064816c8fbf

data/README.md

@@ -31,6 +31,11 @@ Vagrant.configure(2) do |config|
     # Use either OS name or Snapshot identifier
     vultr.os = 'Ubuntu 14.04 x64'
     vultr.snapshot = '524557af2439b'
+
+    # Optional parameters
+    vultr.label    = 'My Label'
+    vultr.tag      = 'My Tag'
+    vultr.hostname = 'myhostname'
   end
 end
 ```
@@ -46,6 +51,7 @@ Notes
 
 1. You have to specify `override.ssh.private_key_path`. Public key will be uploaded to Vultr as "vagrant" SSH key and will be used when servers are created.
 2. Currently, servers are created with "root" user.
+3. If you hit API rate limit, you can set `VULTR_RATE_LIMIT_INTERVAL_MS` environment variable to introduce delay between API requests.
 
 Testing
 -------

data/lib/vagrant-vultr/action/create.rb

@@ -18,18 +18,33 @@ module VagrantPlugins
           plan     = env[:machine].provider_config.plan
           os       = env[:machine].provider_config.os
           snapshot = env[:machine].provider_config.snapshot
+		  enable_ipv6 = env[:machine].provider_config.enable_ipv6
+		  enable_private_network = env[:machine].provider_config.enable_private_network
+          label    = env[:machine].provider_config.label
+          tag      = env[:machine].provider_config.tag
+          hostname = env[:machine].provider_config.hostname
 
           @logger.info "Creating server with:"
           @logger.info "  -- Region: #{region}"
           @logger.info "  -- OS: #{os}"
           @logger.info "  -- Plan: #{plan}"
           @logger.info "  -- Snapshot: #{snapshot}"
+          @logger.info "  -- Enable IPv6: #{enable_ipv6}"
+          @logger.info "  -- Enable Private Network: #{enable_private_network}"
+          @logger.info "  -- Label: #{label}"
+          @logger.info "  -- Tag: #{tag}"
+          @logger.info "  -- Hostname: #{hostname}"
 
           attributes = {
             region: region,
             os: os,
             plan: plan,
             snapshot: snapshot,
+            enable_ipv6: enable_ipv6,
+            enable_private_network: enable_private_network,
+            label: label,
+            tag: tag,
+            hostname: hostname,
             ssh_key_name: Action::SetupSSHKey::NAME
           }
           @machine.id = @client.create_server(attributes)

data/lib/vagrant-vultr/config.rb

@@ -6,6 +6,11 @@ module VagrantPlugins
       attr_accessor :os
       attr_accessor :snapshot
       attr_accessor :plan
+      attr_accessor :enable_ipv6
+      attr_accessor :enable_private_network
+      attr_accessor :label
+      attr_accessor :tag
+      attr_accessor :hostname
 
       # @api private
       attr_accessor :ssh_key_id
@@ -16,6 +21,11 @@ module VagrantPlugins
         @os = UNSET_VALUE
         @snapshot = UNSET_VALUE
         @plan = UNSET_VALUE
+        @enable_ipv6 = UNSET_VALUE
+        @enable_private_network = UNSET_VALUE
+        @label    = UNSET_VALUE
+        @tag      = UNSET_VALUE
+        @hostname = UNSET_VALUE
       end
 
       def finalize!
@@ -24,6 +34,11 @@ module VagrantPlugins
         @os = 'Ubuntu 14.04 x64' if @os == UNSET_VALUE && @snapshot == UNSET_VALUE
         @plan = '768 MB RAM,15 GB SSD,1.00 TB BW' if @plan == UNSET_VALUE
         @snapshot = nil if @snapshot == UNSET_VALUE
+        @enable_ipv6 = 'no' if @enable_ipv6 == UNSET_VALUE
+        @enable_private_network = 'no' if @enable_private_network == UNSET_VALUE
+        @label    = '' if @label    == UNSET_VALUE
+        @tag      = '' if @tag      == UNSET_VALUE
+        @hostname = '' if @hostname == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-vultr/helpers/client.rb

@@ -34,10 +34,16 @@ module VagrantPlugins
         end
 
         def create_server(attributes)
+          location_id = region_id(attributes[:region])
           params = {
-            DCID: region_id(attributes[:region]),
-            VPSPLANID: vps_plan_id(attributes[:plan]),
-            SSHKEYID: ssh_key_id(attributes[:ssh_key_name])
+            DCID: location_id,
+            VPSPLANID: vps_plan_id(attributes[:plan], location_id.class.name == "String" ? location_id.to_i : location_id),
+            SSHKEYID: ssh_key_id(attributes[:ssh_key_name]),
+            enable_ipv6: attributes[:enable_ipv6],
+            enable_private_network: attributes[:enable_private_network],
+            label:    attributes[:label],
+            tag:      attributes[:tag],
+            hostname: attributes[:hostname]
           }
 
           if attributes[:snapshot]
@@ -81,9 +87,9 @@ module VagrantPlugins
           regions.find { |r| r['name'] == region }['DCID']
         end
 
-        def vps_plan_id(plan)
+        def vps_plan_id(plan, location_id)
           plans = request { ::Vultr::Plans.list }
-          plans.values.find { |p| p['name'] == plan }['VPSPLANID']
+          plans.values.find { |p| p['name'] == plan && p['available_locations']&.include?(location_id) }['VPSPLANID']
         end
 
         def ssh_keys
@@ -134,6 +140,10 @@ module VagrantPlugins
         private
 
         def request
+          if interval = ENV['VULTR_RATE_LIMIT_INTERVAL_MS']
+            sleep interval.to_f / 1000
+          end
+
           response = yield
           if response[:status] != 200
             raise "API request failed: #{response[:result]}."

data/vagrant-vultr.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name        = 'vagrant-vultr'
-  spec.version     = '0.1.2'
+  spec.version     = '0.1.3'
   spec.author      = 'Alex Rodionov'
   spec.email       = 'p0deje@gmail.com'
   spec.homepage    = 'http://github.com/p0deje/vagrant-vultr'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vultr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alex Rodionov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-26 00:00:00.000000000 Z
+date: 2023-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vultr
@@ -100,7 +100,7 @@ homepage: http://github.com/p0deje/vagrant-vultr
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,12 +115,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.3.25
+signing_key:
 specification_version: 4
 summary: Vultr provider for Vagrant
 test_files:
 - features/support/env.rb
 - features/vagrant-vultr.feature
-has_rdoc: