trap trying to destroy while provisioning

packethost · Jul 1, 2018 · 2316760 · 2316760
1 parent c5654db
commit 2316760
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/vagrant-packet/action/terminate_instance.rb b/lib/vagrant-packet/action/terminate_instance.rb
@@ -18,8 +18,12 @@ def call(env)
 
           # Destroy the server and remove the tracking ID
           env[:ui].info(I18n.t('vagrant_packet.terminating'))
-          server.destroy
-          env[:machine].id = nil
+          begin
+            server.destroy
+            env[:machine].id = nil
+          rescue Exception => e
+            env[:ui].info(I18n.t('vagrant_packet.terminate_while_provisioning'))
+          end
 
           @app.call(env)
         end

diff --git a/locales/en.yml b/locales/en.yml
@@ -22,6 +22,9 @@ en:
       Stopping the instance...
     terminating: |-
       Terminating the instance...
+    terminate_while_provisioning: |-
+      Cannot destroy a machine while provisioning. 
+      Wait for provisioning to finish then try again.
     waiting_for_ready: |-
       Waiting for instance to become "ready"...
     waiting_for_ssh: |-