vagrant-openstack-plugin 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6715c22f8c8ed79285aac9b2c9b0ea4183518686
-  data.tar.gz: 438166569c8bd01f0bacb6f461615982589f8dd7
+  metadata.gz: c685d66661ea243dc4d8c73b8f4c817c5d8c1661
+  data.tar.gz: 2202e0c0a24bf6527c7cc5011aea420db83732c3
 SHA512:
-  metadata.gz: d53204d935f19cd2235f8e9685b91bcba58913f525a1aac21192fd3de1e124ee03dfe99d38124957ba3aeceb1fe4e02ca6a31962944d29b57a445e4ab68371d3
-  data.tar.gz: 5a64045bcdc12873cc02abcbd23e5016b105466f6609d5a16f67cfc0b579166458b12f89a0aacb7e214d931718da66ca0beded54cb338c119ab41f9008fedbcc
+  metadata.gz: f637c987968a37910aafd222c466037f0eccbce39774693b95d8dc5fee3c47764f6caad178a5ba1ae4bfe68460d011e4a7357329889b9d1a840cbae5bba811b7
+  data.tar.gz: cc0a8cfac02294cbb496844568b56b636013bf3c50517d00a18b8872251ff98177c23fb5b713809e55fabcffc906c13ea90472eb5672f5e22f035f1c1ac63803

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog for vagrant-openstack-plugin
 
+## 0.11.1
+
+- Merge pull request #99 from jtopjian/master [view commit](http://github.com///commit/1c2667532e408f239761882a367c11d948610f37)
+- Update README.md to add Static IP instructions [view commit](http://github.com///commit/9246d8b9389dd4e1108e0f3ab7c2652459d6d192)
+- Merge pull request #98 from Chealion/fixFloatingIP [view commit](http://github.com///commit/1d6635791286bf396ec1a852730116ec1c0bbba0)
+- Don't release a floating IP unless it was automatically assigned. [view commit](http://github.com///commit/c5f51082323b9defa5d101b0f5decbe68e15cfa3)
+
 ## 0.11.0
 
 - Merge pull request #97 from cbaenziger/issue_96_fix [view commit](http://github.com///commit/36295904ffb65d7461870a97e561c470fdedbbe5)

data/README.md

@@ -77,7 +77,7 @@ Vagrant.configure("2") do |config|
     os.availability_zone  = "az0001"           # optional
     os.security_groups    = ['ssh', 'http']    # optional
     os.tenant             = "YOUR TENANT_NAME" # optional
-    os.floating_ip        = "33.33.33.33"      # optional (The floating IP to assign for this instance)
+    os.floating_ip        = "33.33.33.33"      # optional (The floating IP to assign for this instance, or set to :auto)
     os.floating_ip_pool   = "public"           # optional (The floating IP pool to allocate addresses from, if floating_ip = :auto)
 
     os.disks              = [                  # optional
@@ -185,10 +185,29 @@ end
 
 ## Networks
 
-Networking features in the form of `config.vm.network` are not
-supported with `vagrant-openstack-plugin`, currently. If any of these are
-specified, Vagrant will emit a warning, but will otherwise boot
-the OpenStack server.
+Static IP assignment is supported by doing the following:
+
+First, define one or more networks with `os.networks`:
+
+```ruby
+os.networks = ['network1', 'network2']
+```
+
+Next, configure those networks using `config.vm.network`:
+
+```ruby
+config.vm.network 'private_network', ip: '192.168.1.100'
+config.vm.network 'private_network', ip: '192.168.2.100'
+```
+
+Note that the order must be the same as the order in `os.networks`.
+If you only want to configure the second NIC with a static IP, do
+the following:
+
+```ruby
+config.vm.network 'private_network', type: 'dhcp'
+config.vm.network 'private_network', ip: '192.168.2.100'
+```
 
 ## Synced Folders
 
@@ -228,6 +247,7 @@ Take snapshot of ***vmname*** with name ***snapshotname***
 - [nicobrevin](https://github.com/nicobrevin)
 - [ohnoimdead](https://github.com/ohnoimdead)
 - [cbaenziger](https://github.com/cbaenziger)
+- [chealion](https://github.com/chealion)
 
 ## Development
 

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

@@ -52,7 +52,7 @@ module VagrantPlugins
                 end
               end
 
-              if machine.provider_config.floating_ip_pool
+              if machine.provider_config.floating_ip_pool && machine.provider_config.floating_ip == ":auto"
                 address = env[:openstack_compute].list_all_addresses.body["floating_ips"].find{|i| i["ip"] == ip}
                 if address
                   env[:openstack_compute].release_address(address["id"])

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

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

metadata

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