vagrant-openstack-plugin 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bcbaeca3f9db2c7bc8c3a6895eeb7f3a2f12726
-  data.tar.gz: c5598b5a10e611996fb677bd3014b765e0e59bf1
+  metadata.gz: 01d0a86ac145465d408d91c5387d8892c176006c
+  data.tar.gz: 78e8230f1fad0b44aeb1bd695b5215328edfdfe5
 SHA512:
-  metadata.gz: c2237cdfbffdb4b41ef3e5e1b5cfdcd5c8c8d46403645c59d30396e9ee25fcf11e4dd373f875ece6d1aa29e2fa32f5bb1875e912cefb0e820571ce55ad89f1a5
-  data.tar.gz: c362a66a69cc6fc6cf2c654de53b5a9c184d8e4f7ff525eaac601673741fb6af6e580241548dd1b323532178046cd8a966f7a1e57d9ae42d5e425d63150fb404
+  metadata.gz: 89a2d4209381bf135c4fa5b6d97888d862bf68a8882fa25a9f85667e494e46216d978eba1a8437a4c202f9ce9c1b13cbcc6d467289eea143813a30b8ae461977
+  data.tar.gz: 0181830fd9f026b958b95afd454e4a28e1026aa65f1dc2c8c235cdbcdf85bf57c6c1730c8b358e91a97bb12a156bfd24652b1cbb6e2318b7204223ce878b8a0e

data/CHANGELOG.md

@@ -1,8 +1,23 @@
 # Changelog for vagrant-openstack-plugin
 
-## 0.4.0
-
-- fix version
+## 0.5.0
+
+- Merge pull request #45 from detiber/fixNetworksPR [view commit](http://github.com///commit/56b28eff5a1079c6805ec944b1a0c1dde458b10e)
+- Merge pull request #53 from tjheeta/remote_machine_id [view commit](http://github.com///commit/5873d1b5282fe2d24a0e725ec6289d1ba5e20e9b)
+- Merge pull request #54 from last-g/patch-1 [view commit](http://github.com///commit/7941573ef8f547a915e31c51ab4d1b85b878eebe)
+- Merge pull request #56 from nicobrevin/feature-no-verify-peer [view commit](http://github.com///commit/844835811808d256f67ad43e0124ace3f552a18c)
+- Merge pull request #58 from ohnoimdead/no-network-fix [view commit](http://github.com///commit/4b44a7c80d4a381531266844a5c99de0eea850b5)
+- Fix for exception when OS endpoint doesn't have neutron installed [view commit](http://github.com///commit/7558bbed3b5ecae8bb3e3ca9c64ffc9512a4c170)
+- add ssl_verify_peer config option [view commit](http://github.com///commit/cb94f002d790afb5fbec225d17385c8f5b0ebb35)
+- Missing semicolon [view commit](http://github.com///commit/8f609ee474b548b096e42b08c27fc5f874037204)
+- Missing region while configuring networks [view commit](http://github.com///commit/ea10bff5cdabea0b9c543a5231500fb7f9fd50ac)
+- Fix for delete_server [view commit](http://github.com///commit/d4f812eb99d135f7b7c5d210778e92cd8e5a4561)
+- If the .vagrant directory does not contain the machine id, try to connect remotely to try to find it [view commit](http://github.com///commit/71447bf49afe1fed29fa7ce561305dcc756a2e16)
+- Fix test for config.network and config.networks. [view commit](http://github.com///commit/5c9161aaf3ac715bc52819ee99c2d02d8434ea7b)
+
+## 0.4.1
+
+- update release info [view commit](http://github.com///commit/9866c83713ec0f1db8aed02a9aa9cbaafe8e85a4)
 
 ## 0.4.0
 

data/Gemfile

@@ -6,5 +6,5 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
 end

data/README.md

@@ -136,6 +136,7 @@ This provider exposes quite a few provider-specific configuration options:
 * `tenant` - Tenant name.  You only need to specify this if your OpenStack user has access to multiple tenants.
 * `region` - Region Name. Specify the region you want the instance to be launched in for multi-region environments.
 * `proxy` - HTTP proxy. When behind a firewall override this value for API access.
+* `ssl_verify_peer` - sets the ssl_verify_peer on the underlying excon connection - useful for self signed certs etc.
 
 These can be set like typical provider-specific configuration:
 
@@ -167,6 +168,27 @@ the remote machine over SSH.
 This is good enough for all built-in Vagrant provisioners (shell,
 chef, and puppet) to work!
 
+## Contributors
+
+- [mitchellh](https://github.com/mitchellh)
+- [tkadauke](https://github.com/tkadauke)
+- [srenatus](https://github.com/srenatus)
+- [hvolkmer](https://github.com/hvolkmer)
+- [ehaselwanter](https://github.com/ehaselwanter)
+- [BRIMIL01](https://github.com/BRIMIL01)
+- [jkburges](https://github.com/jkburges)
+- [johnbellone](https://github.com/johnbellone)
+- [mat128](https://github.com/mat128)
+- [jtopjian](https://github.com/jtopjian)
+- [antoviaque](https://github.com/antoviaque)
+- [last-g](https://github.com/last-g)
+- [spil-jasper](https://github.com/spil-jasper)
+- [detiber](https://github.com/detiber)
+- [RackerJohnMadrid](https://github.com/RackerJohnMadrid)
+- [Lull3rSkat3r](https://github.com/Lull3rSkat3r)
+- [nicobrevin](https://github.com/nicobrevin)
+- [ohnoimdead](https://github.com/ohnoimdead)
+
 ## Development
 
 To work on the `vagrant-openstack-plugin` plugin, clone this repository out, and use

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

@@ -24,7 +24,10 @@ module VagrantPlugins
 
           # Pass proxy config down into the Fog::Connection object using
           # the `connection_options` hash.
-          connection_options = { :proxy => config.proxy }
+          connection_options = {
+            :proxy           => config.proxy,
+            :ssl_verify_peer => config.ssl_verify_peer
+          }
 
           @logger.info("Connecting to OpenStack...")
           @logger.debug("API connection params: #{connection_options.inspect}")
@@ -38,14 +41,15 @@ module VagrantPlugins
             :openstack_region => region
           })
 
-          if config.network || config.networks
+          if config.networks && !config.networks.empty?
             env[:openstack_network] = Fog::Network.new({
               :provider => :openstack,
               :connection_options => connection_options,
               :openstack_username => username,
               :openstack_api_key => api_key,
               :openstack_auth_url => endpoint,
-              :openstack_tenant => tenant
+              :openstack_tenant => tenant,
+              :openstack_region => region
             })
           end
 

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

@@ -49,13 +49,11 @@ module VagrantPlugins
           unless config.networks
             if config.network
               config.networks = [ config.network ]
-            else
-              config.networks = []
             end
           end
 
           # Find networks if provided
-          if config.networks
+          unless config.networks.empty?
             env[:ui].info(I18n.t("vagrant_openstack.finding_network"))
             options[:nics] = Array.new
             config.networks.each do |net|

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

@@ -11,9 +11,12 @@ module VagrantPlugins
         end
 
         def call(env)
-          if env[:machine].id
+          machine = env[:machine]
+          id = machine.id || env[:openstack_compute].servers.all( :name => machine.name ).first.id
+
+          if id
             env[:ui].info(I18n.t("vagrant_openstack.deleting_server"))
-            server = env[:openstack_compute].servers.get(env[:machine].id)
+            server = env[:openstack_compute].servers.get(id)
             server.destroy
             env[:machine].id = nil
           end

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

@@ -18,10 +18,9 @@ module VagrantPlugins
         end
 
         def read_ssh_info(openstack, machine)
-          return nil if machine.id.nil?
-
-          # Find the machine
-          server = openstack.servers.get(machine.id)
+            id = machine.id || openstack.servers.all( :name => machine.name ).first.id rescue nil
+          return nil if id.nil?
+          server = openstack.servers.get(id)
           if server.nil?
             # The machine can't be found
             @logger.info("Machine couldn't be found, assuming it got destroyed.")

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

@@ -18,10 +18,11 @@ module VagrantPlugins
         end
 
         def read_state(openstack, machine)
-          return :not_created if machine.id.nil?
+          id = machine.id || openstack.servers.all( :name => machine.name ).first.id rescue nil
+          return :not_created if id.nil?
 
           # Find the machine
-          server = openstack.servers.get(machine.id)
+          server = openstack.servers.get(id)
           if server.nil? || server.state == "DELETED"
             # The machine can't be found
             @logger.info("Machine not found or deleted, assuming it got destroyed.")

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

@@ -99,6 +99,10 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :proxy
 
+      # Value for SSL_VERIFY_PEER, defaults to true.  Set to false for self
+      # signed ssl certificate
+      attr_accessor :ssl_verify_peer
+
       def initialize
         @api_key  = UNSET_VALUE
         @endpoint = UNSET_VALUE
@@ -120,6 +124,7 @@ module VagrantPlugins
         @floating_ip = UNSET_VALUE
         @region = UNSET_VALUE
         @proxy = UNSET_VALUE
+        @ssl_verify_peer = UNSET_VALUE
       end
 
       def finalize!
@@ -151,6 +156,7 @@ module VagrantPlugins
 
         @region = nil if @region == UNSET_VALUE
         @proxy = nil if @proxy == UNSET_VALUE
+        @ssl_verify_peer = nil if @ssl_verify_peer == UNSET_VALUE
       end
 
       def validate(machine)

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenStack
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/spec/vagrant-openstack-plugin/config_spec.rb

@@ -23,6 +23,7 @@ describe VagrantPlugins::OpenStack::Config do
     its(:scheduler_hints) { should be_nil }
     its(:tenant) { should be_nil }
     its(:proxy) { should be_nil }
+    its(:ssl_verify_peer) { should be_nil }
   end
 
   describe "overriding defaults" do
@@ -38,6 +39,7 @@ describe VagrantPlugins::OpenStack::Config do
       :security_groups,
       :scheduler_hints,
       :tenant,
+      :ssl_verify_peer,
       :proxy].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, "foo")

data/vagrant-openstack-plugin.gemspec

@@ -6,8 +6,8 @@ require 'vagrant-openstack-plugin/version'
 Gem::Specification.new do |gem|
   gem.name          = "vagrant-openstack-plugin"
   gem.version       = VagrantPlugins::OpenStack::VERSION
-  gem.authors       = ["Mitchell Hashimoto", "Thomas Kadauke"]
-  gem.email         = ["mitchell@hashicorp.com", "t.kadauke@cloudbau.de"]
+  gem.authors       = ["Edmund Haselwanter"]
+  gem.email         = ["me@ehaselwanter.com"]
   gem.description   = "Enables Vagrant to manage machines in OpenStack Cloud."
   gem.summary       = "Enables Vagrant to manage machines in OpenStack Cloud."
   gem.homepage      = "http://www.vagrantup.com"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-plugin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
-- Mitchell Hashimoto
-- Thomas Kadauke
+- Edmund Haselwanter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -55,8 +54,7 @@ dependencies:
         version: 2.13.0
 description: Enables Vagrant to manage machines in OpenStack Cloud.
 email:
-- mitchell@hashicorp.com
-- t.kadauke@cloudbau.de
+- me@ehaselwanter.com
 executables: []
 extensions: []
 extra_rdoc_files: []