vagrant-openstack-plugin 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f101fc3c74f7fb1e3d33a8ef15a48d0089f0d08e
-  data.tar.gz: 46372f4bb20d168e3cec85ef3dfdcc437ba46344
+  metadata.gz: 6715c22f8c8ed79285aac9b2c9b0ea4183518686
+  data.tar.gz: 438166569c8bd01f0bacb6f461615982589f8dd7
 SHA512:
-  metadata.gz: d27c4cad80f1270a5d52a6c558d63e8406fb24d62e2dfddda0790a5576253e88fce41987be155d4f935e8f8b98de1d2f642cddce3c04d78a7763a515cdd504d8
-  data.tar.gz: f14c372717634e8d09ba1ccc6c9e1ca3d3468577b4004960a7890eb7482b76235d97d93729563e18f38b53b2ed94e5051adac36c759c592b0d86c3a6c95c11d7
+  metadata.gz: d53204d935f19cd2235f8e9685b91bcba58913f525a1aac21192fd3de1e124ee03dfe99d38124957ba3aeceb1fe4e02ca6a31962944d29b57a445e4ab68371d3
+  data.tar.gz: 5a64045bcdc12873cc02abcbd23e5016b105466f6609d5a16f67cfc0b579166458b12f89a0aacb7e214d931718da66ca0beded54cb338c119ab41f9008fedbcc

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.11.0
+
+- Merge pull request #97 from cbaenziger/issue_96_fix [view commit](http://github.com///commit/36295904ffb65d7461870a97e561c470fdedbbe5)
+- Merge pull request #95 from cbaenziger/volume_support [view commit](http://github.com///commit/3d3fb8d6ae3b3115abea725820ac4a205c814070)
+- Retry server deletes until we are sure the VM is dead -- only then remove IP's and volumes [view commit](http://github.com///commit/8799e70521a4ad4c4d1a5aa2a3ea42b83c042c38)
+- Update README for more volume related material [view commit](http://github.com///commit/c0e6e0afae67a1e63095f917d50b7c3aa3655547)
+- Fix to prevent stack trace failing to find VM, if destroying a non-existant VM [view commit](http://github.com///commit/7632b70a9f2c5af3a6d46a31b2ce4beb1bc9217b)
+- Use same check as connect.rb for Vagrantfile disks section [view commit](http://github.com///commit/bd440fbacd7abc7914629431edd74e73cad71f95)
+- Fix issue finding volumes if running vagrant destroy after server is destroyed [view commit](http://github.com///commit/8629390d724cdaa611504121bca64690e191cdba)
+
 ## 0.10.0
 
 - Merge pull request #84 from cbaenziger/volume_support [view commit](http://github.com///commit/fc613a49cb5b2fecf2255d3050d1bff68956735d)

data/README.md

@@ -15,6 +15,7 @@ This plugin started as a fork of the Vagrant RackSpace provider.
 * SSH into the instances.
 * Provision the instances with any built-in Vagrant provisioner.
 * Minimal synced folder support via `rsync`.
+* Creation and destruction of volumes with VM
 
 ## Usage
 
@@ -80,8 +81,8 @@ Vagrant.configure("2") do |config|
     os.floating_ip_pool   = "public"           # optional (The floating IP pool to allocate addresses from, if floating_ip = :auto)
 
     os.disks              = [                  # optional
-                             {"name" => "volume_name_here", "description" => "First 10GB Volume", "size" => 10},
-                             {"name" => "volume_name_here", "description" => "Second 10GB Volume", "size" => 10}
+                             {"name" => "volume_name_here", "description" => "A 10GB Volume", "size" => 10},
+                             {"name" => "volume_name_here", "description" => "A 20GB Volume", "size" => 20}
                             ]
 
     os.orchestration_stack_name = 'stack01'				# optional
@@ -167,6 +168,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `orchestration_cfn_template_parameters` - AWS CloudFormation Template
   parameters specified in ruby hash (take a look at example Vagrantfile).
   This parameter is optional.
+* `disks` - Array of disk specifications to create or attach
 
 These can be set like typical provider-specific configuration:
 
@@ -225,6 +227,7 @@ Take snapshot of ***vmname*** with name ***snapshotname***
 - [Lull3rSkat3r](https://github.com/Lull3rSkat3r)
 - [nicobrevin](https://github.com/nicobrevin)
 - [ohnoimdead](https://github.com/ohnoimdead)
+- [cbaenziger](https://github.com/cbaenziger)
 
 ## Development
 

data/lib/vagrant-openstack-plugin/action/create_server.rb

@@ -143,7 +143,7 @@ module VagrantPlugins
               
               # Process disks if provided
               volumes = Array.new
-              if config.has_key?("disks") and not config.disks.empty?
+              if config.disks && !config.disks.empty?
                 env[:ui].info(I18n.t("vagrant_openstack.creating_disks"))
                 config.disks.each do |disk|
                   volume = env[:openstack_compute].volumes.all.find{|v| v.name ==

data/lib/vagrant-openstack-plugin/action/delete_server.rb

@@ -1,3 +1,6 @@
+require 'vagrant/util/retryable'
+require 'timeout'
+
 require "log4r"
 
 module VagrantPlugins
@@ -5,6 +8,8 @@ module VagrantPlugins
     module Action
       # This deletes the running server, if there is one.
       class DeleteServer
+        include Vagrant::Util::Retryable
+
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new("vagrant_openstack::action::delete_server")
@@ -12,18 +17,41 @@ module VagrantPlugins
 
         def call(env)
           machine = env[:machine]
-          id = machine.id || env[:openstack_compute].servers.all( :name => machine.name ).first.id
+          id = machine.id || (env[:openstack_compute].servers.all( :name => machine.name ).length == 1 and
+                              env[:openstack_compute].servers.all( :name => machine.name ).first.id)
 
           if id
-            volumes = env[:openstack_compute].servers.get(id).volume_attachments
-
             env[:ui].info(I18n.t("vagrant_openstack.deleting_server"))
 
             # TODO: Validate the fact that we get a server back from the API.
             server = env[:openstack_compute].servers.get(id)
             if server
+              # get volumes before destroying server
+              volumes = server.volume_attachments
+
               ip = server.floating_ip_address
-              server.destroy
+
+              retryable(:on => Timeout::Error, :tries => 20) do
+                # If we're interrupted don't worry about waiting
+                next if env[:interrupted]
+
+                begin
+                  server.destroy if server
+                  status = Timeout::timeout(10) {
+                    while server.reload
+                      sleep(1)
+                    end
+                  }
+                rescue RuntimeError => e
+                  # If we don't have an error about a state transition, then
+                  # we just move on.
+                  raise if e.message !~ /should have transitioned/
+                  raise Errors::ServerNotDestroyed
+                rescue Fog::Compute::OpenStack::NotFound
+                  # If we don't have a server anymore we should be done here just continue on
+                end
+              end
+
               if machine.provider_config.floating_ip_pool
                 address = env[:openstack_compute].list_all_addresses.body["floating_ips"].find{|i| i["ip"] == ip}
                 if address
@@ -44,6 +72,8 @@ module VagrantPlugins
                 end
               end
             end
+          else
+            env[:ui].info(I18n.t("vagrant_openstack.not_created"))
           end
 
           @app.call(env)

data/lib/vagrant-openstack-plugin/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.10.0"
+    VERSION = '0.11.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Edmund Haselwanter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog