vagrant-terraform 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0950b52c922bc9c326421581112c78ce6f809b881d776d722c163c257d2533db'
-  data.tar.gz: 2b338a1ad80608402402014432ddadbf7dcaa48b525eb26b9f3c1a2028879879
+  metadata.gz: 5e305adfd79a1c56e8812dd068a5b2502a34236603ba57e1285597459d3e6387
+  data.tar.gz: db6c7c8e2235700b96fe3b548265b40fcb1624259e22f2efa036aabd293e6208
 SHA512:
-  metadata.gz: dbd1bc88e4160d35c8a24d755f14da84284e5a3281fa1fa2d0db6602e924c8d2a90b55352255538b28ae3f7233bf4b117c027a3c6377fd9d56946a316b617b0f
-  data.tar.gz: ea80d8464356373470f57c330ded91a6ee5dfa7bd7584f85902ef21445ad8f8c53f62c6e51468a85cfb33fbbd100510ca4b0286053282d535daf74d366c5ada5
+  metadata.gz: fa6c9c6524467a8adf146fb8e41110df58d877e9f02de05252cfa776a6d37e0189b32c0ee1c1e342e4841155344791ffe28af32ea45f24625eb9491d663a364a
+  data.tar.gz: 246a8498c3cfa9ff61cf48fe713ccc1f838fe774858021c7194d5699d96dec3890b6aaf727ac8ffe27b361a1efef0b15937fa059ab336d0c4205a34f5016580f

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

@@ -45,13 +45,14 @@ provider "proxmox" {
 resource "proxmox_vm_qemu" "#{vmname.gsub(/\./, '-')}" {
     name       = "#{vmname}"
     target_nodes = ["#{config.target_node}"]
-    desc = "#{config.description}"
+    desc       = "#{config.description}"
     vm_state   = "stopped"
     clone      = "#{config.template}"
     full_clone = "#{config.full_clone}"
     cores      = #{config.cpu_cores.to_i}
+    cpu_type   = "#{config.cpu_type}"
     memory     = #{Filesize.from("#{config.memory_size} B").to_f('MiB').to_i}
-    onboot = #{config.onboot}
+    onboot     = #{config.onboot}
     agent      = 1
     vga {
         type   = "#{config.vga}"
@@ -170,11 +171,55 @@ END
           terraform_main_file = "#{terraform_dir}/main.tf"
 
           File.write(terraform_main_file, main_tf)
-          terraform_execute(env, 'terraform init')
+
+          # Avoid downloading the provider every time even when it's in the cache
+          ENV['TF_PLUGIN_CACHE_MAY_BREAK_DEPENDENCY_LOCK_FILE'] = "1"
+          retryable(on: Errors::TerraformError, tries: 100, sleep: 1) do
+            begin
+              terraform_execute(env, 'terraform init')
+            rescue Errors::TerraformError => e
+              # https://github.com/hashicorp/terraform/issues/32915
+              # https://github.com/hashicorp/terraform/issues/31964
+              # The message 'text file busy' comes when something is attempting to overwrite the executable
+              # for a running process which is using the same data. The plugin cache is not safe for concurrent
+              # access, and overwriting running providers can result in unexpected behavior.
+              ansi_escape_regex = /\e\[(?:[0-9]{1,2}(?:;[0-9]{1,2})*)?[m|K]/
+              if e.message.gsub(ansi_escape_regex, '').include?("Failed to install provider")
+                @logger.debug("Failed to install provider, retrying")
+                raise e
+              end
+            end
+          end
 
           retryable(on: Errors::TerraformError, tries: 10, sleep: 1) do
             begin
-              terraform_execute(env, "terraform apply -auto-approve")
+              lockfile = '.vagrant/terraform/lock'
+              max_retries = 300
+              retry_delay = 2
+
+              File.open(lockfile, 'w') do |file|
+                retries = 0
+
+                # VM creation can't be done in parallel because multiple VMs might get the same ID
+                # Get a lock before creating VM with 'terraform apply'
+                until file.flock(File::LOCK_EX | File::LOCK_NB)
+                  if retries >= max_retries
+                    raise Errors::CreateVMError,
+                      :error_message => "Failed to acquire lock after #{max_retries} attempts. Exiting."
+                  end
+
+                  @logger.debug("Lock is currently held. Retrying in #{retry_delay} seconds...")
+                  retries += 1
+                  sleep(retry_delay)
+                end
+
+                begin
+                  terraform_execute(env, "terraform apply -auto-approve")
+                ensure
+                  file.flock(File::LOCK_UN)
+                end
+              end
+
             rescue Errors::TerraformError => e
               # ==> vm_one: terraform stderr: ╷
               # ==> vm_one: │ Error: can't lock file '/var/lock/qemu-server/lock-100.conf' - got timeout
@@ -193,7 +238,7 @@ 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 failed, retrying")
+                env[:ui].info("Proxmox clone failed with command timeout, retrying")
                 raise e
               end
 
@@ -205,7 +250,26 @@ END
 
               # Terraform error message was 'volume 'qnap-nfs:104/vm-104-disk-1.raw' does not exist'
               if e.message.gsub(ansi_escape_regex, '') =~ /.*volume .* does not exist/
-                env[:ui].info("Volume not created, retrying")
+                # https://github.com/bpg/terraform-provider-proxmox/issues/1599
+                env[:ui].info("Volume not created, retrying. Error was: #{e.message}")
+                raise e
+              end
+
+              # Terraform error message was 'clone failed: disk image '/mnt/pve/qnap-nfs/images/104/vm-104-cloudinit.qcow2' already exists'
+              if e.message.gsub(ansi_escape_regex, '') =~ /.*disk image .* already exists/
+                env[:ui].info("Clone failed, retrying. Error was: #{e.message}")
+                raise e
+              end
+
+              # Terraform error message was "clone failed: unable to create image: qemu-img: /mnt/pve/qnap-nfs/images/105/vm-105-cloudinit.qcow2: Could not create '/mnt/pve/qnap-nfs/images/105/vm-105-cloudinit.qcow2': No such file or directory"
+              if e.message.gsub(ansi_escape_regex, '') =~ /.*unable to create image: .* No such file or directory/
+                env[:ui].info("Clone failed, retrying. Error was: #{e.message}")
+                raise e
+              end
+
+              # Terraform error message was 'Request cancelled'
+              if e.message.gsub(ansi_escape_regex, '').include?("Request cancelled")
+                env[:ui].info("Proxmox error: Request cancelled")
                 raise e
               end
 

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

@@ -22,6 +22,7 @@ module VagrantPlugins
             # dir_name = env[:root_path].basename.to_s.dup.gsub(/[^-a-z0-9_]/i, "")
             begin
               Dir.mkdir(File.dirname(terraform_dir)) unless File.exist?(File.dirname(terraform_dir))
+              FileUtils.touch("#{File.dirname(terraform_dir)}/lock")
             rescue => e
               retry if e.message =~ /File exists/
               env[:ui].error("terraform init failed: #{e.message}")

data/lib/vagrant-terraform/config.rb

@@ -17,6 +17,7 @@ module VagrantPlugins
       attr_accessor :disk_size
       attr_accessor :storage_domain
       attr_accessor :cpu_cores
+      attr_accessor :cpu_type
       attr_accessor :memory_size
       attr_accessor :target_node
       attr_accessor :onboot
@@ -31,7 +32,7 @@ module VagrantPlugins
         @api_url           = UNSET_VALUE
         @api_token_id      = UNSET_VALUE
         @api_token_secret  = UNSET_VALUE
-        @vga           = UNSET_VALUE
+        @vga               = UNSET_VALUE
         @insecure          = UNSET_VALUE
         @debug             = UNSET_VALUE
         @vmname            = UNSET_VALUE
@@ -39,6 +40,7 @@ module VagrantPlugins
         @disk_size         = UNSET_VALUE
         @storage_domain    = UNSET_VALUE
         @cpu_cores         = UNSET_VALUE
+        @cpu_type          = UNSET_VALUE
         @memory_size       = UNSET_VALUE
         @target_node       = UNSET_VALUE
         @onboot            = UNSET_VALUE
@@ -62,6 +64,7 @@ module VagrantPlugins
         @disk_size = nil if @disk_size == UNSET_VALUE
         @storage_domain = nil if @storage_domain == UNSET_VALUE
         @cpu_cores = 1 if @cpu_cores == UNSET_VALUE
+        @cpu_type = 'host' if @cpu_type == UNSET_VALUE
         @memory_size = '512 MiB' if @memory_size == UNSET_VALUE
         @target_node = nil if @target_node == UNSET_VALUE
         @onboot = false if @onboot == UNSET_VALUE

data/lib/vagrant-terraform/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module TerraformProvider
-    VERSION = '0.1.10'
+    VERSION = '0.1.12'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-terraform
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Mika Båtsman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize