vagrant-openstack-provider 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ee292bbda02fdc4f61b3d79ef0275edf0df7735
-  data.tar.gz: a0299d495eb5cb64c3d7dfc47690340ad2eb4ccf
+  metadata.gz: 4ec695cee7421bdd2633f9e39de360d75183671c
+  data.tar.gz: 2281efcfe75b63a318220e301c84fbdbd58ac0dd
 SHA512:
-  metadata.gz: f55aa6db29a728c9f5cd0e9940ca9b1697dc900925f5a444c1eb397b4dd1bd9d734f4c6b0f32470964ac1d56dc458a445b01049b3e7c79032595e85dc42a4db3
-  data.tar.gz: bf8c6aceaa67d1f65c458168191e5ec26ca1e7c4f8bb4ee00acc9e4d816306746bb22ce4d032723d65289f827fea4858baf011a61da6743a728e5b93bd420ffd
+  metadata.gz: 8dd4123bdabf397a9f566b12cbf5a7111b3540b5c79d113566f8ae9c60e9d723e430abed459af0896e7b3b5f9d564de9e45efd29d0fffd1badcb8e964309fe22
+  data.tar.gz: 649d676242e35f639e9932c525647e1d5c25ec41fd08ea6b04fb5d43fbe93329b15f54d1c6f6256d6c8cc9aef88c2412a6efdfa95b02e2497045c3a85bfacd12

data/.rubocop.yml

@@ -25,7 +25,7 @@ Metrics/CyclomaticComplexity:
   Max: 15
 
 Metrics/MethodLength:
-  Max: 60
+  Max: 65
 
 Metrics/LineLength:
   Max: 150

data/CHANGELOG.md

@@ -1,4 +1,23 @@
-# 0.10.0 ( April 11, 2017)
+# 0.11.0 (August 5, 2017)
+
+IMPROVEMENTS:
+
+  - Implement a test suite running all samples #331
+  - Add test for config.ssh.insert_key = false #332
+
+FEATURES:
+
+  - Add "ssl_verify_peer" in config for self-signed certs #85 #320
+  - Add "ssl_ca_file" in config for self-signed certs #329
+
+BUG FIXES:
+
+  - Handling of asynchronous floating IP assignment #324
+  - Fix floating IP assignement #330
+  - Respect config.ssh.insert_key #328
+
+
+# 0.10.0 (April 11, 2017)
 
 IMPROVEMENTS:
 

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

@@ -50,6 +50,7 @@ module VagrantPlugins
 
           waiting_for_server_to_be_built(env, server_id)
           assign_floating_ip(env, server_id)
+          waiting_for_floating_ip_to_be_assigned(env, server_id)
           attach_volumes(env, server_id, options[:volumes]) unless options[:volumes].empty?
 
           @app.call(env)
@@ -72,7 +73,7 @@ module VagrantPlugins
             env[:ui].info(" -- ImageRef        : #{options[:image].id}")
           end
           env[:ui].info(" -- Boot volume     : #{options[:volume_boot][:id]} (#{options[:volume_boot][:device]})") unless options[:volume_boot].nil?
-          env[:ui].info(" -- KeyPair         : #{options[:keypair_name]}")
+          env[:ui].info(" -- KeyPair         : #{options[:keypair_name]}") unless options[:keypair_name].nil?
 
           unless options[:networks].empty?
             formated_networks = ' -- '
@@ -104,7 +105,9 @@ module VagrantPlugins
           unless options[:image].nil?
             log << "image '#{options[:image].name}' (#{options[:image].id}) "
           end
-          log << "and keypair '#{options[:keypair_name]}'"
+          unless options[:keypair_name].nil?
+            log << "and keypair '#{options[:keypair_name]}'"
+          end
 
           @logger.info(log)
 
@@ -152,6 +155,22 @@ module VagrantPlugins
           @logger.info 'Vagrant was unable to resolve FloatingIP, continue assuming it is not necessary'
         end
 
+        def waiting_for_floating_ip_to_be_assigned(env, server_id, retry_interval = 3)
+          floating_ip = @resolver.resolve_floating_ip(env)
+          return if !floating_ip || floating_ip.empty?
+          @logger.info "Waiting for floating IP #{floating_ip} to be assigned"
+          env[:ui].info(I18n.t('vagrant_openstack.waiting_for_floating_ip', floating_ip: floating_ip))
+          config = env[:machine].provider_config
+          Timeout.timeout(config.floating_ip_assign_timeout, Errors::Timeout) do
+            until env[:openstack_client].nova.check_assigned_floating_ip(env, server_id, floating_ip)
+              sleep retry_interval
+            end
+            return
+          end
+        rescue Errors::UnableToResolveFloatingIP
+          @logger.info 'Vagrant was unable to resolve FloatingIP, not waiting for assignment'
+        end
+
         def attach_volumes(env, server_id, volumes)
           @logger.info("Attaching volumes #{volumes} to server #{server_id}")
           volumes.each do |volume|

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

@@ -40,7 +40,9 @@ module VagrantPlugins
             port: @resolver.resolve_ssh_port(env),
             username: @resolver.resolve_ssh_username(env)
           }
-          hash[:private_key_path] = "#{env[:machine].data_dir}/#{get_keypair_name(env)}" unless config.keypair_name || config.public_key_path
+          if env[:machine].config.ssh.insert_key
+            hash[:private_key_path] = "#{env[:machine].data_dir}/#{get_keypair_name(env)}" unless config.keypair_name || config.public_key_path
+          end
           # Should work silently when https://github.com/mitchellh/vagrant/issues/4637 is fixed
           hash[:log_level] = 'ERROR'
           hash

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

@@ -86,7 +86,7 @@ module VagrantPlugins
             s['imageRef'] = options[:image_ref]
           end
           s['flavorRef'] = options[:flavor_ref]
-          s['key_name'] = options[:keypair]
+          s['key_name'] = options[:keypair] unless options[:keypair].nil?
           s['availability_zone'] = options[:availability_zone] unless options[:availability_zone].nil?
           s['security_groups'] = options[:security_groups] unless options[:security_groups].nil?
           s['user_data'] = Base64.encode64(options[:user_data]) unless options[:user_data].nil?
@@ -145,6 +145,19 @@ module VagrantPlugins
         end
       end
 
+      def check_assigned_floating_ip(env, server_id, floating_ip)
+        instance_exists do
+          addresses = get_server_details(env, server_id)['addresses']
+          addresses.each do |_, network|
+            network.each do |network_detail|
+              return true if network_detail['addr'] == floating_ip
+            end
+          end
+
+          return false
+        end
+      end
+
       def import_keypair(env, public_key)
         keyname = "vagrant-generated-#{Kernel.rand(36**8).to_s(36)}"
 

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

@@ -6,19 +6,22 @@ module VagrantPlugins
       def self.get(env, url, headers = {}, &block)
         config = env[:machine].provider_config
         RestClient::Request.execute(method: :get, url: url, headers: headers,
-                                    timeout: config.http.read_timeout, open_timeout: config.http.open_timeout, &block)
+                                    timeout: config.http.read_timeout, open_timeout: config.http.open_timeout,
+                                    ssl_ca_file: config.ssl_ca_file, verify_ssl: config.ssl_verify_peer, &block)
       end
 
       def self.post(env, url, payload, headers = {}, &block)
         config = env[:machine].provider_config
         RestClient::Request.execute(method: :post, url: url, payload: payload, headers: headers,
-                                    timeout: config.http.read_timeout, open_timeout: config.http.open_timeout, &block)
+                                    timeout: config.http.read_timeout, open_timeout: config.http.open_timeout,
+                                    ssl_ca_file: config.ssl_ca_file, verify_ssl: config.ssl_verify_peer, &block)
       end
 
       def self.delete(env, url, headers = {}, &block)
         config = env[:machine].provider_config
         RestClient::Request.execute(method: :delete, url: url, headers: headers,
-                                    timeout: config.http.read_timeout, open_timeout: config.http.open_timeout, &block)
+                                    timeout: config.http.read_timeout, open_timeout: config.http.open_timeout,
+                                    ssl_ca_file: config.ssl_ca_file, verify_ssl: config.ssl_verify_peer, &block)
       end
     end
   end

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

@@ -217,6 +217,10 @@ module VagrantPlugins
       # @return [Integer]
       attr_accessor :stack_delete_timeout
 
+      #
+      # @return [Integer]
+      attr_accessor :floating_ip_assign_timeout
+
       #
       # @return [HttpConfig]
       attr_accessor :http
@@ -239,6 +243,16 @@ module VagrantPlugins
       # @return [Boolean]
       attr_accessor :use_legacy_synced_folders
 
+      # Specify the certificate to use.
+      #
+      # @return [String]
+      attr_accessor :ssl_ca_file
+
+      # Verify ssl peer certificate when connecting. Set to false (! unsecure) to disable
+      #
+      # @return [Boolean]
+      attr_accessor :ssl_verify_peer
+
       def initialize
         @password = UNSET_VALUE
         @openstack_compute_url = UNSET_VALUE
@@ -282,9 +296,12 @@ module VagrantPlugins
         @server_delete_timeout = UNSET_VALUE
         @stack_create_timeout = UNSET_VALUE
         @stack_delete_timeout = UNSET_VALUE
+        @floating_ip_assign_timeout = UNSET_VALUE
         @meta_args_support = UNSET_VALUE
         @http = HttpConfig.new
         @use_legacy_synced_folders = UNSET_VALUE
+        @ssl_ca_file = UNSET_VALUE
+        @ssl_verify_peer = UNSET_VALUE
       end
 
       def merge(other)
@@ -390,11 +407,14 @@ module VagrantPlugins
         @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
+        @floating_ip_assign_timeout = 200 if @floating_ip_assign_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?
         @http.finalize!
+        @ssl_ca_file = nil if @ssl_ca_file == UNSET_VALUE
+        @ssl_verify_peer = true if @ssl_verify_peer == UNSET_VALUE
       end
       # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
@@ -416,10 +436,12 @@ module VagrantPlugins
         validate_stack_config(errors)
         validate_ssh_timeout(errors)
 
-        if machine.config.ssh.private_key_path
-          puts I18n.t('vagrant_openstack.config.keypair_name_required').yellow unless @keypair_name || @public_key_path
-        else
-          errors << I18n.t('vagrant_openstack.config.private_key_missing') if @keypair_name || @public_key_path
+        if machine.config.ssh.insert_key
+          if machine.config.ssh.private_key_path
+            puts I18n.t('vagrant_openstack.config.keypair_name_required').yellow unless @keypair_name || @public_key_path
+          else
+            errors << I18n.t('vagrant_openstack.config.private_key_missing') if @keypair_name || @public_key_path
+          end
         end
 
         {

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

@@ -37,18 +37,25 @@ module VagrantPlugins
         config = env[:machine].provider_config
         nova = env[:openstack_client].nova
         return config.floating_ip if config.floating_ip
+
         fail Errors::UnableToResolveFloatingIP if config.floating_ip_pool.nil? || config.floating_ip_pool.empty?
+
         @logger.debug 'Searching for available ips'
         free_ip = search_free_ip(config, nova, env)
+        config.floating_ip = free_ip
         return free_ip unless free_ip.nil?
+
         @logger.debug 'Allocate new ip anyway'
         allocated_ip = allocate_ip(config, nova, env)
+        config.floating_ip = allocated_ip
         return allocated_ip unless allocated_ip.nil?
       end
 
       def resolve_keypair(env)
         config = env[:machine].provider_config
+        machine_config = env[:machine].config
         nova = env[:openstack_client].nova
+        return nil unless machine_config.ssh.insert_key
         return config.keypair_name if config.keypair_name
         return nova.import_keypair_from_file(env, config.public_key_path) if config.public_key_path
         generate_keypair(env)

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.10.0'
+    VERSION = '0.11.0'
 
     #
     # Stable version must respect the naming convention 'x.y.z'

data/locales/en.yml

@@ -69,6 +69,8 @@ en:
       Rsyncing folder: %{hostpath} => %{guestpath}
     using_floating_ip: |-
       Using floating IP %{floating_ip}
+    waiting_for_floating_ip: |-
+      Waiting for floating IP %{floating_ip} to be assigned...
     waiting_for_build: |-
       Waiting for the server to be built...
     waiting_for_ssh: |-

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

@@ -109,10 +109,12 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
         allow(@action).to receive(:waiting_for_server_to_be_built)
         allow(@action).to receive(:attach_volumes)
         allow(@action).to receive(:waiting_for_server_to_be_reachable)
+        allow(@action).to receive(:waiting_for_floating_ip_to_be_assigned)
 
         expect(@action).to receive(:waiting_for_server_to_be_built).with(env, '45678')
         expect(@action).to receive(:assign_floating_ip).with(env, '45678').and_return('1.2.3.4')
         expect(@action).to receive(:attach_volumes).with(env, '45678', [{ id: 'vol-01', device: nil }])
+        expect(@action).to receive(:waiting_for_floating_ip_to_be_assigned).with(env, '45678')
 
         @action.call(env)
       end

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

@@ -43,6 +43,7 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
     double('ssh_config').tap do |config|
       config.stub(:username) { 'sshuser' }
       config.stub(:port) { nil }
+      config.stub(:insert_key) { true }
     end
   end
 
@@ -166,6 +167,16 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
             log_level: 'ERROR')
         end
       end
+
+      context 'with neither keypair_name nor public_key_path specified and ssh.insert_key is false' do
+        it 'does not return private_key_path' do
+          ssh_config.stub(:insert_key) { false }
+          config.stub(:floating_ip) { '80.80.80.80' }
+          config.stub(:keypair_name) { nil }
+          config.stub(:public_key_path) { nil }
+          @action.read_ssh_info(env).should eq(host: '80.80.80.80', port: 22, username: 'sshuser', log_level: 'ERROR')
+        end
+      end
     end
 
     context 'without config.floating_ip specified' do

data/spec/vagrant-openstack-provider/client/cinder_spec.rb

@@ -11,6 +11,8 @@ describe VagrantPlugins::Openstack::CinderClient do
   let(:config) do
     double('config').tap do |config|
       config.stub(:http) { http }
+      config.stub(:ssl_ca_file) { nil }
+      config.stub(:ssl_verify_peer) { true }
     end
   end
 

data/spec/vagrant-openstack-provider/client/glance_spec.rb

@@ -11,6 +11,8 @@ describe VagrantPlugins::Openstack::GlanceClient do
   let(:config) do
     double('config').tap do |config|
       config.stub(:http) { http }
+      config.stub(:ssl_ca_file) { nil }
+      config.stub(:ssl_verify_peer) { true }
     end
   end
 

data/spec/vagrant-openstack-provider/client/heat_spec.rb

@@ -18,6 +18,8 @@ describe VagrantPlugins::Openstack::NovaClient do
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
       config.stub(:http) { http }
+      config.stub(:ssl_ca_file) { nil }
+      config.stub(:ssl_verify_peer) { true }
     end
   end
 

data/spec/vagrant-openstack-provider/client/keystone_spec.rb

@@ -20,6 +20,8 @@ describe VagrantPlugins::Openstack::KeystoneClient do
       config.stub(:interface_type) { 'public' }
       config.stub(:identity_api_version) { '2' }
       config.stub(:project_name) { 'testTenant' }
+      config.stub(:ssl_ca_file) { nil }
+      config.stub(:ssl_verify_peer) { true }
     end
   end
 

data/spec/vagrant-openstack-provider/client/neutron_spec.rb

@@ -11,6 +11,8 @@ describe VagrantPlugins::Openstack::NeutronClient do
   let(:config) do
     double('config').tap do |config|
       config.stub(:http) { http }
+      config.stub(:ssl_ca_file) { nil }
+      config.stub(:ssl_verify_peer) { true }
     end
   end
 

data/spec/vagrant-openstack-provider/client/nova_spec.rb

@@ -21,6 +21,8 @@ describe VagrantPlugins::Openstack::NovaClient do
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
       config.stub(:http) { http }
+      config.stub(:ssl_ca_file) { nil }
+      config.stub(:ssl_verify_peer) { true }
     end
   end
 

data/spec/vagrant-openstack-provider/config_resolver_spec.rb

@@ -93,6 +93,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
     double('ssh_config').tap do |config|
       config.stub(:username) { nil }
       config.stub(:port) { nil }
+      config.stub(:insert_key) { true }
     end
   end
 
@@ -249,6 +250,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
               FloatingIP.new('80.81.82.85', 'pool-1', nil)
             end
             config.stub(:floating_ip_pool) { ['pool-1'] }
+            config.stub(:floating_ip=) { nil }
             @action.resolve_floating_ip(env).should eq('80.81.82.85')
           end
         end
@@ -261,6 +263,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
                FloatingIP.new('80.81.82.83', 'pool-1', nil)]
             end
             config.stub(:floating_ip_pool) { ['pool-1'] }
+            config.stub(:floating_ip=) { nil }
             @action.resolve_floating_ip(env).should eq('80.81.82.83')
           end
         end
@@ -275,6 +278,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
             FloatingIP.new('80.81.82.84', 'pool-1', nil)
           end
           config.stub(:floating_ip_pool) { ['pool-1'] }
+          config.stub(:floating_ip=) { nil }
           @action.resolve_floating_ip(env).should eq('80.81.82.84')
         end
       end
@@ -294,6 +298,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
               FloatingIP.new('80.81.82.85', 'pool-1', nil)
             end
             config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            config.stub(:floating_ip=) { nil }
             @action.resolve_floating_ip(env).should eq('80.81.82.85')
           end
         end
@@ -306,6 +311,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
                FloatingIP.new('80.81.82.83', 'pool-2', nil)]
             end
             config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            config.stub(:floating_ip=) { nil }
             @action.resolve_floating_ip(env).should eq('80.81.82.83')
           end
         end
@@ -322,6 +328,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
               FloatingIP.new('80.81.82.84', 'pool-1', nil)
             end
             config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            config.stub(:floating_ip=) { nil }
             @action.resolve_floating_ip(env).should eq('80.81.82.84')
           end
         end
@@ -337,6 +344,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
               FloatingIP.new('80.81.82.84', 'pool-2', nil)
             end
             config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            config.stub(:floating_ip=) { nil }
             @action.resolve_floating_ip(env).should eq('80.81.82.84')
           end
         end
@@ -350,6 +358,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
             nova.stub(:allocate_floating_ip).with(env, 'pool-1').and_raise Errors::VagrantOpenstackError, message: 'error', code: 404
             nova.stub(:allocate_floating_ip).with(env, 'pool-2').and_raise Errors::VagrantOpenstackError, message: 'error', code: 404
             config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            config.stub(:floating_ip=) { nil }
             expect { @action.resolve_floating_ip(env) }.to raise_error(Errors::VagrantOpenstackError)
           end
         end
@@ -397,6 +406,16 @@ describe VagrantPlugins::Openstack::ConfigResolver do
         @action.resolve_keypair(env).should eq('my-keypair-imported')
       end
     end
+
+    context 'with insert_key false' do
+      it 'does nothing and return nil' do
+        config.stub(:keypair_name) { 'my-keypair' }
+        ssh_config.stub(:insert_key) { false }
+        nova.should_not_receive(:import_keypair_from_file)
+        @action.should_not_receive(:generate_keypair)
+        @action.resolve_keypair(env).should be_nil
+      end
+    end
   end
 
   describe 'generate_keypair' do

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

@@ -29,6 +29,7 @@ describe VagrantPlugins::Openstack::Config do
     its(:security_groups) { should be_nil }
     its(:user_data) { should be_nil }
     its(:metadata) { should be_nil }
+    its(:ssl_ca_file) { should eq nil }
   end
 
   describe 'overriding defaults' do
@@ -50,7 +51,8 @@ describe VagrantPlugins::Openstack::Config do
       :user_data,
       :metadata,
       :availability_zone,
-      :public_key_path].each do |attribute|
+      :public_key_path,
+      :ssl_ca_file].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, 'foo')
         subject.finalize!
@@ -270,6 +272,7 @@ describe VagrantPlugins::Openstack::Config do
       machine.stub_chain(:env, :root_path).and_return '/'
       ssh.stub(:private_key_path) { 'private key path' }
       ssh.stub(:username) { 'ssh username' }
+      ssh.stub(:insert_key) { true }
       config.stub(:ssh) { ssh }
       machine.stub(:config) { config }
       subject.username = 'foo'
@@ -348,6 +351,16 @@ describe VagrantPlugins::Openstack::Config do
           validation_errors.first.should == error_message
         end
       end
+
+      context 'keypair_name or public_key_path is set and ssh.insert_key is false' do
+        it 'should not error' do
+          ssh.stub(:private_key_path) { nil }
+          ssh.stub(:insert_key) { false }
+          subject.public_key_path = 'public_key'
+          I18n.should_not_receive(:t)
+          validation_errors.should be_empty
+        end
+      end
     end
 
     context 'the password' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json