vagrant-openstack-provider 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9022e93970b0f478724dc90c2ca175f58fb01709
-  data.tar.gz: fd7fdb5c1d26754414d7ef0fcf090c4262e8a355
+  metadata.gz: 4dd7cf830eecfb15611665ed53da19db9cd5bab5
+  data.tar.gz: 1b5bce071291bc0af764f91933b839803ee3f4c7
 SHA512:
-  metadata.gz: e0f29d5cda71ac448c6bd089aec587a05d0affed2dc2dbcd0df39af8e16e9ba2651a69720907d67047203d3c3e21493a5d06c4e19944a699bb975b2662556d21
-  data.tar.gz: 0347baa297f56ded5ffb9eeffd081808763cb63ec079803ab158616cc867a25036c79392c4a4c929673be1d41ad36e779cccad71529a7d37362c3c9a8201a070
+  metadata.gz: b95d4b1ccc79200bcd97f7a189e21768b214b3f50056d77ff53c83d7581b31c3d23a3e9d343f7023b37a31e8128a65cf6303c7315af3f3f00906286e634145c5
+  data.tar.gz: 2f071db27ddf020cb30cbf15bbcb7e11e0944dcf63572418c6fc3ce751d4080da54931172424fc88dc2aacf7fb7011ec8f6cedf17278ed7793e11f770d257e96

data/CHANGELOG.md

@@ -1,4 +1,27 @@
-# 0.7.0 (August, 10, 2015)
+# 0.7.2 (May 1, 2016)
+
+IMPROVEMENTS:
+
+  - Allow status and ssh to run without a lock #282
+  - Switch to standard WaitForCommunicator middleware #281
+
+BUG FIXES:
+
+  - Run provisioner cleanup when destroying VMs #272
+  - Windows host provisioning using Winrm #264
+  - Use only provided ssh key and don't touch the known_hosts #259
+  - Fix hooks for provisioners #248, #249, #28
+  - Support standard option config.vm.boot_timeout #227
+
+# 0.7.1 (February 19, 2016)
+
+BUG FIXES:
+
+  - Fix dependency to make it work with Vagrant 1.8 #265, #266 , #268
+  - Fix heat stack create when multiple machines are declared #260
+  - Fix regression, vagrant provision was broken #240
+
+# 0.7.0 (August 10, 2015)
   
 FEATURES:
 

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.7.4'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
   gem 'appraisal', '1.0.0'
   gem 'rubocop', '0.29.0', require: false
   gem 'coveralls', require: false

data/functional_tests/Vagrantfile

@@ -4,6 +4,7 @@ Vagrant.configure('2') do |config|
 
   config.vm.box = 'openstack'
   config.vm.box_url = 'https://github.com/ggiamarchi/vagrant-openstack/raw/master/source/dummy.box'
+  config.vm.boot_timeout = ENV['OS_SSH_TIMEOUT'].to_i
 
   config.ssh.private_key_path = ENV['OS_KEYPAIR_PRIVATE_KEY']
   config.ssh.pty = true
@@ -16,7 +17,6 @@ Vagrant.configure('2') do |config|
     os.openstack_compute_url  = ENV['OS_COMPUTE_URL']
     os.openstack_network_url  = ENV['OS_NETWORK_URL']
     os.tenant_name            = ENV['OS_TENANT_NAME']
-    os.ssh_timeout            = ENV['OS_SSH_TIMEOUT'].to_i
     os.sync_method            = ENV['OS_SYNC_METHOD']
     os.flavor                 = ENV['OS_FLAVOR']
     os.image                  = ENV['OS_IMAGE']

data/lib/vagrant-openstack-provider/action.rb

@@ -17,6 +17,7 @@ module VagrantPlugins
             if env[:machine_state_id] == :not_created
               b2.use Message, I18n.t('vagrant_openstack.not_created')
             else
+              b2.use(ProvisionerCleanup, :before)
               b2.use DeleteServer
               b2.use DeleteStack
             end
@@ -33,7 +34,11 @@ module VagrantPlugins
             if env[:machine_state_id] == :not_created
               b2.use Message, I18n.t('vagrant_openstack.not_created')
             else
-              b2.use ProvisionWrapper
+              if env[:machine].provider_config.meta_args_support
+                b2.use ProvisionWrapper
+              else
+                b2.use Provision
+              end
               b2.use SyncFolders
             end
           end
@@ -99,12 +104,27 @@ module VagrantPlugins
             case env[:machine_state_id]
             when :not_created
               ssh_disabled = env[:machine].provider_config.ssh_disabled
-              b2.use ProvisionWrapper unless ssh_disabled
+              unless ssh_disabled
+                if env[:machine].provider_config.meta_args_support
+                  b2.use ProvisionWrapper
+                else
+                  b2.use Provision
+                end
+              end
               b2.use SyncFolders
               b2.use CreateStack
               b2.use CreateServer
               b2.use Message, I18n.t('vagrant_openstack.ssh_disabled_provisioning') if ssh_disabled
-              b2.use WaitForServerToBeAccessible unless ssh_disabled
+              unless ssh_disabled
+                # Handle legacy ssh_timeout option
+                timeout = env[:machine].provider_config.ssh_timeout
+                unless timeout.nil?
+                  env[:machine].ui.warn I18n.t('vagrant_openstack.config.ssh_timeout_deprecated')
+                  env[:machine].config.vm.boot_timeout = timeout
+                end
+
+                b2.use WaitForCommunicator
+              end
             when :shutoff
               b2.use StartServer
             when :suspended
@@ -215,7 +235,6 @@ module VagrantPlugins
       autoload :ProvisionWrapper, action_root.join('provision')
       autoload :WaitForServerToStop, action_root.join('wait_stop')
       autoload :WaitForServerToBeActive, action_root.join('wait_active')
-      autoload :WaitForServerToBeAccessible, action_root.join('wait_accessible')
 
       private
 

data/lib/vagrant-openstack-provider/action/sync_folders.rb

@@ -82,6 +82,15 @@ module VagrantPlugins
               incls << incl
             end
 
+            # Create ssh params for rsync
+            # we need them as one string because rsync -e expects one string
+            ssh_params = [
+              "ssh -p #{ssh_info[:port]}",
+              '-o StrictHostKeyChecking=no',
+              '-o UserKnownHostsFile=/dev/null',
+              '-o IdentitiesOnly=yes',
+              "#{ssh_key_options(ssh_info)}"].join(' ')
+
             # Rsync over to the guest path using the SSH info. add
             # .hg/ and .git/ to exclude list as that isn't covered in
             # --cvs-exclude
@@ -92,7 +101,7 @@ module VagrantPlugins
               '--exclude', '.git/',
               '--chmod', 'ugo=rwX',
               *includes,
-              '-e', "ssh -p #{ssh_info[:port]} -o StrictHostKeyChecking=no #{ssh_key_options(ssh_info)}",
+              '-e', ssh_params,
               hostpath,
               "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
             command.compact!

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

@@ -73,8 +73,9 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :ssh_username
 
-      # The SSH timeout use after server creation. If server startup is too long
-      # the timeout value can be increase with this variable. Default is 60 seconds
+      # The SSH timeout use after server creation.
+      #
+      # Deprecated. Use config.vm.boot_timeout instead.
       #
       # @return [Integer]
       attr_accessor :ssh_timeout
@@ -194,6 +195,10 @@ module VagrantPlugins
       # @return [HttpConfig]
       attr_accessor :http
 
+      #
+      # @return [Boolean]
+      attr_accessor :meta_args_support
+
       def initialize
         @password = UNSET_VALUE
         @openstack_compute_url = UNSET_VALUE
@@ -235,6 +240,7 @@ module VagrantPlugins
         @server_delete_timeout = UNSET_VALUE
         @stack_create_timeout = UNSET_VALUE
         @stack_delete_timeout = UNSET_VALUE
+        @meta_args_support = UNSET_VALUE
         @http = HttpConfig.new
       end
 
@@ -309,15 +315,17 @@ module VagrantPlugins
         @ssh_disabled = false if @ssh_disabled == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
-        # `config.ssh` values are used.
+        # `config.ssh` and `config.vm.boot_timeout` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
-        @ssh_timeout = 180 if @ssh_timeout == UNSET_VALUE
+        @ssh_timeout = nil if @ssh_timeout == UNSET_VALUE
+
         @server_create_timeout = 200 if @server_create_timeout == UNSET_VALUE
         @server_active_timeout = 200 if @server_active_timeout == UNSET_VALUE
         @server_stop_timeout = 200 if @server_stop_timeout == UNSET_VALUE
         @server_delete_timeout = 200 if @server_delete_timeout == UNSET_VALUE
         @stack_create_timeout = 200 if @stack_create_timeout == UNSET_VALUE
         @stack_delete_timeout = 200 if @stack_delete_timeout == UNSET_VALUE
+        @meta_args_support = false if @meta_args_support == UNSET_VALUE
         @networks = nil if @networks.empty?
         @volumes = nil if @volumes.empty?
         @stacks = nil if @stacks.empty?

data/lib/vagrant-openstack-provider/provider.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
         # Run a custom action called "read_ssh_info" which does what it
         # says and puts the resulting SSH info into the `:machine_ssh_info`
         # key in the environment.
-        env = @machine.action('read_ssh_info')
+        env = @machine.action('read_ssh_info', lock: false)
         env[:machine_ssh_info]
       end
 
@@ -30,7 +30,7 @@ module VagrantPlugins
         # Run a custom action we define called "read_state" which does
         # what it says. It puts the state in the `:machine_state_id`
         # key in the environment.
-        env = @machine.action('read_state')
+        env = @machine.action('read_state', lock: false)
 
         state_id = env[:machine_state_id]
 

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

@@ -4,7 +4,7 @@ module VagrantPlugins
     # Stable versions must respect the pattern given
     # by VagrantPlugins::Openstack::VERSION_PATTERN
     #
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
 
     #
     # Stable version must respect the naming convention 'x.y.z'

data/locales/en.yml

@@ -132,6 +132,10 @@ en:
         standard vagrant configuration option `config.ssh.username` instead
       ssh_username_required: |-
         vagrant standard configuration option `ssh.username` is required
+      ssh_timeout_deprecated: |-
+        ssh_timeout provider config is deprecated for vagrant-openstack provider.
+        If you are using it, it will continue to work but we recommend switching
+        to the standard vagrant configuration option `config.vm.boot_timeout`.
       invalid_value_for_parameter: |-
         Invalid value '%{value}' for parameter '%{parameter}'
 

data/spec/vagrant-openstack-provider/action/sync_folders_spec.rb

@@ -111,7 +111,7 @@ describe VagrantPlugins::Openstack::Action::SyncFolders do
                             '--chmod',
                             'ugo=rwX',
                             '-e',
-                            "ssh -p 23 -o StrictHostKeyChecking=no -i '/tmp/key.pem' ",
+                            "ssh -p 23 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -i '/tmp/key.pem' ",
                             '/home/john/vagrant/',
                             'user@1.2.3.4:/vagrant',
                             '--exclude-from',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -29,14 +29,14 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
@@ -85,84 +85,84 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
 description: Enables Vagrant to manage machines in OpenStack Cloud.
@@ -173,8 +173,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -205,7 +205,6 @@ files:
 - lib/vagrant-openstack-provider/action/stop_server.rb
 - lib/vagrant-openstack-provider/action/suspend.rb
 - lib/vagrant-openstack-provider/action/sync_folders.rb
-- lib/vagrant-openstack-provider/action/wait_accessible.rb
 - lib/vagrant-openstack-provider/action/wait_active.rb
 - lib/vagrant-openstack-provider/action/wait_stop.rb
 - lib/vagrant-openstack-provider/catalog/openstack_catalog.rb
@@ -256,7 +255,6 @@ files:
 - spec/vagrant-openstack-provider/action/stop_server_spec.rb
 - spec/vagrant-openstack-provider/action/suspend_server_spec.rb
 - spec/vagrant-openstack-provider/action/sync_folders_spec.rb
-- spec/vagrant-openstack-provider/action/wait_accessible_spec.rb
 - spec/vagrant-openstack-provider/action/wait_active_spec.rb
 - spec/vagrant-openstack-provider/action/wait_stop_spec.rb
 - spec/vagrant-openstack-provider/action_spec.rb
@@ -293,17 +291,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines in OpenStack Cloud.
@@ -322,7 +320,6 @@ test_files:
 - spec/vagrant-openstack-provider/action/stop_server_spec.rb
 - spec/vagrant-openstack-provider/action/suspend_server_spec.rb
 - spec/vagrant-openstack-provider/action/sync_folders_spec.rb
-- spec/vagrant-openstack-provider/action/wait_accessible_spec.rb
 - spec/vagrant-openstack-provider/action/wait_active_spec.rb
 - spec/vagrant-openstack-provider/action/wait_stop_spec.rb
 - spec/vagrant-openstack-provider/action_spec.rb

data/lib/vagrant-openstack-provider/action/wait_accessible.rb

@@ -1,61 +0,0 @@
-require 'log4r'
-
-module VagrantPlugins
-  module Openstack
-    module Action
-      class WaitForServerToBeAccessible < AbstractAction
-        def initialize(app, env, resolver = nil, ssh = nil)
-          @logger   = Log4r::Logger.new('vagrant_openstack::action::wait_accessible')
-          @app      = app
-          @ssh      = ssh || Vagrant::Action::Builtin::SSHRun.new(app, env)
-          @resolver = resolver || VagrantPlugins::Openstack::ConfigResolver.new
-        end
-
-        def execute(env)
-          waiting_for_server_to_be_reachable(env)
-          @logger.info 'The server is ready'
-          env[:ui].info(I18n.t('vagrant_openstack.ready'))
-          @app.call(env)
-        end
-
-        private
-
-        def waiting_for_server_to_be_reachable(env)
-          return if env[:interrupted]
-          ssh_timeout = env[:machine].provider_config.ssh_timeout
-          return if server_is_reachable?(env, ssh_timeout)
-          env[:ui].error(I18n.t('vagrant_openstack.timeout'))
-          fail Errors::SshUnavailable, host: @resolver.resolve_floating_ip(env), timeout: ssh_timeout
-        end
-
-        def server_is_reachable?(env, timeout)
-          start_time = Time.now
-          current_time = start_time
-          nb_retry = 0
-
-          while (current_time - start_time) <= timeout
-            @logger.debug "Checking if SSH port is open... Attempt number #{nb_retry}"
-            if nb_retry % 5 == 0
-              @logger.info 'Waiting for SSH to become available...'
-              env[:ui].info(I18n.t('vagrant_openstack.waiting_for_ssh'))
-            end
-
-            env[:ssh_run_command] = 'exit 0'
-            env[:ssh_opts] = {
-              extra_args: ['-o', 'BatchMode=yes']
-            }
-            @ssh.call(env)
-            return true if env[:ssh_run_exit_status] == 0
-
-            @logger.debug 'SSH not yet available... new retry in in 1 second'
-            nb_retry += 1
-            sleep 1
-            current_time = Time.now
-          end
-
-          false
-        end
-      end
-    end
-  end
-end

data/spec/vagrant-openstack-provider/action/wait_accessible_spec.rb

@@ -1,67 +0,0 @@
-require 'vagrant-openstack-provider/spec_helper'
-
-describe VagrantPlugins::Openstack::Action::WaitForServerToBeAccessible do
-  let(:config) do
-    double('config')
-  end
-
-  let(:env) do
-    {}.tap do |env|
-      env[:ui] = double('ui')
-      env[:ui].stub(:info).with(anything)
-      env[:ui].stub(:error).with(anything)
-      env[:machine] = double('machine').tap do |m|
-        m.stub(:provider_config) { config }
-      end
-    end
-  end
-
-  let(:resolver) do
-    double('resolver').tap do |r|
-      r.stub(:resolve_floating_ip).with(anything) { '1.2.3.4' }
-    end
-  end
-
-  let(:ssh) do
-    double('shh')
-  end
-
-  let(:app) do
-    double('app').tap do |app|
-      app.stub(:call).with(anything)
-    end
-  end
-
-  class SSHMock
-    def initialize(*exit_codes)
-      @times = 0
-      @exit_codes = exit_codes
-    end
-
-    def call(env)
-      env[:ssh_run_exit_status] = @exit_codes[@times]
-      @times += 1
-    end
-  end
-
-  describe 'call' do
-    context 'when server is not yet reachable' do
-      it 'retry until server is reachable' do
-        config.stub(:ssh_timeout) { 2 }
-        expect(app).to receive(:call)
-
-        @action = WaitForServerToBeAccessible.new(app, nil, resolver, SSHMock.new(1, 0))
-        @action.call(env)
-      end
-    end
-    context 'when server is not yet reachable after timeout' do
-      it 'raise an error' do
-        config.stub(:ssh_timeout) { 1 }
-        expect(app).should_not_receive(:call)
-
-        @action = WaitForServerToBeAccessible.new(app, nil, resolver, SSHMock.new(1, 1))
-        expect { @action.call(env) }.to raise_error Errors::SshUnavailable
-      end
-    end
-  end
-end