vagrant-scaleway 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68c6cfc180c8f556e04bf0c5cbdbb7067313771f
-  data.tar.gz: 4f7c631a1d1a3330ba46f7a36db41690fa25c0d2
+  metadata.gz: 2d888f4cfc2ccc9db3c6adaf6e58771349685c88
+  data.tar.gz: 93a3157878dff2451e50c13faec1833bae2a9b9d
 SHA512:
-  metadata.gz: d0768b1d56c4c27e91dd9980b8548198a74d74807e230ca834f8a512c935f31de21313e7ee4629516ecf735ce202a781abea44b4991c3d817d74bc433105d5b7
-  data.tar.gz: db517633542cc32b9d09cb9760c662095ac3934fcc1edcfd3c52bf55a64a568407560662739d36cffb5ff14108fe564346abf2e19564e755bf626250303409c9
+  metadata.gz: 85f3d5b27171c273719de6ff3f09e849b51d7f1468562147d7c78086b1ed0080c66ec9f887e35122f2afce4f4ac9ee014c2fbc81855eede2afd0b118db63b35a
+  data.tar.gz: 07147d526adc8a108d237b5cb381c4ea910e74f102dbe27609794f9e96eded98cc59ee9c5df22dfd0c9acfae88882c95edbfdb0f2759207ef8c0efc426b32600

data/README.md

@@ -38,6 +38,10 @@ Vagrant.configure('2') do |config|
   config.vm.provider :scaleway do |scaleway, override|
     scaleway.organization = 'YOUR_ORGANIZATION_UUID'
     scaleway.token = 'YOUR_TOKEN'
+    scaleway.volumes = [
+      { id: 'ADDITIONAL_VOLUME_UUID' },
+      { size: 50_000_000_000 }
+    ]
 
     override.ssh.private_key_path = '~/.ssh/id_rsa'
   end

data/lib/vagrant-scaleway/action/create_server.rb

@@ -25,6 +25,7 @@ module VagrantPlugins
           name            = config.name
           security_group  = config.security_group
           tags            = config.tags
+          volumes         = config.volumes.map.with_index(1).to_h.invert
 
           env[:ui].info(I18n.t('vagrant_scaleway.creating_server'))
           env[:ui].info(" -- Bootscript: #{bootscript}") if bootscript
@@ -33,10 +34,12 @@ module VagrantPlugins
           env[:ui].info(" -- Name: #{name}")
           env[:ui].info(" -- Security Group: #{security_group}") if security_group
           env[:ui].info(" -- Tags: #{tags}") unless tags.empty?
+          env[:ui].info(" -- Volumes: #{volumes}") unless volumes.empty?
 
           options = {
             name:            name,
             image:           image,
+            volumes:         volumes,
             commercial_type: commercial_type,
             tags:            tags
           }

data/lib/vagrant-scaleway/action/read_ssh_info.rb

@@ -30,7 +30,7 @@ module VagrantPlugins
           # read attribute override
           ssh_host_attribute = machine.provider_config.ssh_host_attribute
           # default host attributes to try. NOTE: Order matters!
-          ssh_attrs = %i(public_ip_address public_dns_name private_ip_address private_dns_name)
+          ssh_attrs = %i[public_ip_address public_dns_name private_ip_address private_dns_name]
           ssh_attrs = (Array(ssh_host_attribute) + ssh_attrs).uniq if ssh_host_attribute
           # try each attribute, get out on first value
           host = nil

data/lib/vagrant-scaleway/config.rb

@@ -65,7 +65,7 @@ module VagrantPlugins
 
       # Tags to apply to the server.
       #
-      # @return [Array]
+      # @return [Array<String>]
       attr_accessor :tags
 
       # The API token to access Scaleway. It can also be configured with
@@ -74,6 +74,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :token
 
+      # Volumes to be attached to the server.
+      #
+      # @return [Array<Hash>]
+      attr_accessor :volumes
+
       def initialize
         @bootscript            = UNSET_VALUE
         @commercial_type       = UNSET_VALUE
@@ -87,6 +92,7 @@ module VagrantPlugins
         @ssh_host_attribute    = UNSET_VALUE
         @tags                  = []
         @token                 = UNSET_VALUE
+        @volumes               = []
       end
 
       def finalize!
@@ -106,6 +112,18 @@ module VagrantPlugins
         @security_group        = nil if @security_group == UNSET_VALUE
         @ssh_host_attribute    = nil if @ssh_host_attribute == UNSET_VALUE
         @token                 = ENV['SCW_TOKEN'] if @token == UNSET_VALUE
+
+        @volumes = @volumes.map do |volume|
+          if volume.key?(:id)
+            { name: 'volume' }.merge(volume)
+          else
+            {
+              name: 'volume',
+              volume_type: 'l_ssd',
+              organization: @organization
+            }.merge(volume)
+          end
+        end
       end
     end
 

data/lib/vagrant-scaleway/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Scaleway
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/vagrant-scaleway.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-scaleway/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scaleway
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Satoshi Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler