vagrant-terraform 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b0980af98e95f4a9587641a569daeb896410b4bb86990d46f1816967321ebfd
-  data.tar.gz: 48c0115b522bb13890487a8854f6d771a7b4dda7196287105cbc740bbf4571cf
+  metadata.gz: b91e84fbdc3a525218339936061f9350f02db124777bb7b07d1ac17229e02c6c
+  data.tar.gz: ae303b93001724e9696a22de69eca6f4d1822dc1063763a8d40aeaa1f9c73878
 SHA512:
-  metadata.gz: 6099a9a5c0029347b8d4f9ced88266ebeb62a2e21d8b9d92803d79ffe1b02af46ac619d3308feb1dd9148dc5e84fc5b096c449403c2e44e27987d41d5dcdb1d0
-  data.tar.gz: f8d825bdc67246c31e4cb0fb99f8b10eeb1f91563800ca195300bb74e7947f05e943fae52fdf6ce7325cdbed7d6d060db50a4debcfb399526a030c86c0f296ec
+  metadata.gz: c26f1555ad6de110ddac0b844eb50d34ce1dde3f93b8918ccf33ab4cd0848f4d54ff373ca973cbb2ae29bddb5e2f0481f00085beaacb9c3b690fb7989b05ad62
+  data.tar.gz: 6e381a75c334749f0d8f1368a4f781a17b2f125d528544a30a0406fbca0104546bf2bfe2784ca75d2eacd07380f823fd29d6dc00984819addd7bba2901583ee3

data/lib/vagrant-terraform/action/create_vm.rb

@@ -80,6 +80,7 @@ resource "proxmox_vm_qemu" "#{vmname.gsub(/\./, '-')}" {
             }
         }
     }
+%SERIAL%
     nameserver = "#{config.nameserver}"
     searchdomain = "#{config.searchdomain}"
 %NETWORKS%
@@ -116,6 +117,18 @@ terraform {
     ipconfig%IDX% = "%IP%"
 END
 
+          serial_template = <<-END
+    serial {
+      id = 0
+      type = "socket"
+    }
+END
+          if config.serial_port
+            main_tf = main_tf.gsub(/%SERIAL%/, serial_template)
+          else
+            main_tf = main_tf.gsub(/%SERIAL%/, '')
+          end
+
           vagrantfile_networks = []
           env[:machine].id = vmname
           env[:machine].config.vm.networks.each_with_index do |network, idx|
@@ -150,8 +163,8 @@ END
           env[:ui].info(" -- Target node:   #{config.target_node}")
           env[:ui].info(" -- Storage domain: #{config.storage_domain}")
           env[:ui].info(" -- CPU Cores:     #{config.cpu_cores}")
-          env[:ui].info(" -- Memory:        #{Filesize.from("#{config.memory_size} B").to_f('MiB').to_i} MB")
-          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GiB').to_i} GB") unless config.disk_size.nil?
+          env[:ui].info(" -- Memory:        #{Filesize.from("#{config.memory_size} B").to_f('MB').to_i} MB")
+          env[:ui].info(" -- Disk:          #{Filesize.from("#{config.disk_size} B").to_f('GB').to_i} GB") unless config.disk_size.nil?
 
           terraform_dir = env[:machine_tf_dir]
           terraform_main_file = "#{terraform_dir}/main.tf"
@@ -171,6 +184,18 @@ END
                 raise e
               end
 
+              # Terraform error message was 'clone failed: cfs-lock 'storage-qnap-nfs' error: got lock request timeout'
+              if e.message.gsub(ansi_escape_regex, '').include?("clone failed: cfs-lock")
+                env[:ui].info("Proxmox unable to get storage lock, retrying")
+                raise e
+              end
+
+              # Terraform error message was 'clone failed: 'storage-qnap-nfs'-locked command timed out - aborting'
+              if e.message.gsub(ansi_escape_regex, '').include?("command timed out")
+                env[:ui].info("Proxmox clone template, retrying")
+                raise e
+              end
+
               if e.message.gsub(ansi_escape_regex, '') =~ /.*Error: [0-9 ]*unable to create VM [0-9]*: config file already exists/
                 env[:ui].info("Proxmox ID conflict, retrying")
                 raise e

data/lib/vagrant-terraform/action/wait_for_vm_up.rb

@@ -35,6 +35,12 @@ module VagrantPlugins
             return false
           rescue Net::SSH::AuthenticationFailed
             return true
+          rescue Errno::ECONNRESET
+            @logger.debug("Got connection reset")
+            return false
+          rescue StandardError => e
+            @logger.debug("Got error #{e.message}")
+            return false
           end
           return false
         end
@@ -46,7 +52,7 @@ module VagrantPlugins
           # Wait for VM to obtain an ip address.
           env[:metrics]["instance_ip_time"] = Util::Timer.time do
             env[:ui].info(I18n.t("vagrant_terraform.waiting_for_ip"))
-            for attempt in 1..300
+            for attempt in 1..100
               # If we're interrupted don't worry about waiting
               next if env[:interrupted]
 

data/lib/vagrant-terraform/config.rb

@@ -25,6 +25,7 @@ module VagrantPlugins
       attr_accessor :searchdomain
       attr_accessor :os_type
       attr_accessor :full_clone
+      attr_accessor :serial_port
 
       def initialize
         @api_url           = UNSET_VALUE
@@ -46,6 +47,7 @@ module VagrantPlugins
         @searchdomain      = UNSET_VALUE
         @os_type           = UNSET_VALUE
         @full_clone        = UNSET_VALUE
+        @serial_port       = UNSET_VALUE
       end
 
       def finalize!
@@ -68,6 +70,7 @@ module VagrantPlugins
         @searchdomain = '' if @searchdomain == UNSET_VALUE
         @os_type = 'l26' if @os_type == UNSET_VALUE
         @full_clone = true if @full_clone == UNSET_VALUE
+        @serial_port = false if @serial_port == UNSET_VALUE
 
         unless disk_size.nil?
           begin

data/lib/vagrant-terraform/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module TerraformProvider
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mika Båtsman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -69,7 +69,7 @@ homepage: https://github.com/mika-b/vagrant-terraform
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.22
-signing_key: 
+signing_key:
 specification_version: 4
 summary: This vagrant plugin provides the ability to create, control, and destroy
   virtual machines under proxmox