vagrant-conoha 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5f6d8e918ef420c86161b4975201a0c2a8a7f57
-  data.tar.gz: bfed2b1a52dd42baabdc1d9bea2517372fa166ca
+  metadata.gz: 2c29698b0a2fe6b73bc0c0aa25018eba9983b07c
+  data.tar.gz: 1894ed5c1de790b660ba5a9d7e8d0857528dedaf
 SHA512:
-  metadata.gz: aa75a9dbdcc1ee891f3b47b7dfea65f4a92790ca6d65e1e49550982da4525e232df65e25c90e202d604c8d5b6b54f1b06d4335f1ca9734f6c115ee8701f43cd4
-  data.tar.gz: 5cd9d0b742944b21262f159c4fc45d0861391162959c35565fde7e3842102e0aabfaabbde21acb7384aa440fe9c06543d19436879d46f0d7d39a899f3b102302
+  metadata.gz: 958d00ad314df677595e667229d8a0520f98f4e7d5138118f2d1135e6daeefd9fe7f01954ffb80fd6f1617fceb8615f6c08293895c893f1ef5c3c0893e71ed68
+  data.tar.gz: 786d1afd0eceaff4336b9b4d757140f5cbf165c61acdc105e1a597ef604ae099105ad396b76a57805659a1dccc62bafba15361adeadef2c9952beaa79b35a51f

data/.rubocop.yml

@@ -3,6 +3,7 @@ AllCops:
     - '.bundle/**/*'
     - 'out/**/*'
     - '**/Vagrantfile'
+  DisplayCopNames: true
 
 Style/FileName:
   Enabled: false
@@ -24,7 +25,7 @@ Metrics/CyclomaticComplexity:
   Max: 15
 
 Metrics/MethodLength:
-  Max: 60
+  Max: 65
 
 Metrics/LineLength:
   Max: 150

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.1.8
+ - upstream(0.10.0)に追従した
+
 # 0.1.7
  - upstream(0.9)に追従した
 

data/Vagrantfile

@@ -96,6 +96,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     #
     # conoha.keypair_name       = "my-keypair"
 
+    # スタートアップスクリプトを指定します。
+    # cloud-config形式、シェルスクリプト形式、どちらでも記述できます。
+    # Base64エンコードする必要はありません。
+    #
+    # 詳細は下記URLを参考にしてください。
+    # https://www.conoha.jp/guide/startupscript.php
+    #
+    # conoha.user_data = ""
+
   end
 
   # すでにSSH公開鍵をコントロールパネルに登録している場合は、

data/lib/vagrant-conoha/action.rb

@@ -18,6 +18,7 @@ module VagrantPlugins
               b2.use Message, I18n.t('vagrant_openstack.not_created')
             else
               b2.use(ProvisionerCleanup, :before)
+              b2.use SnapshotCleanup if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
               b2.use DeleteServer
               b2.use DeleteStack
             end
@@ -233,6 +234,77 @@ module VagrantPlugins
         end
       end
 
+      # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
+      # rubocop:disable IndentationWidth
+      if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
+      def self.action_snapshot_delete
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SnapshotDelete
+            end
+          end
+        end
+      end
+
+      def self.action_snapshot_list
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SnapshotList
+            end
+          end
+        end
+      end
+
+      def self.action_snapshot_restore
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+              next
+            end
+
+            b2.use SnapshotRestore
+            b2.use WaitForServerToBeActive
+            b2.use WaitForCommunicator
+
+            b2.use Call, IsEnvSet, :snapshot_delete do |env2, b3|
+              # Used by vagrant push/pop
+              b3.use action_snapshot_delete if env2[:result]
+            end
+
+            b2.use action_provision
+          end
+        end
+      end
+
+      def self.action_snapshot_save
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectOpenstack
+          b.use Call, IsState, :not_created do |env, b2|
+            if env[:result]
+              b2.use Message, I18n.t('vagrant_openstack.not_created')
+            else
+              b2.use SnapshotSave
+            end
+          end
+        end
+      end
+      end # Vagrant > 1.8.0 guard
+      # rubocop:enable IndentationWidth
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :Message, action_root.join('message')
@@ -251,6 +323,16 @@ module VagrantPlugins
       autoload :ProvisionWrapper, action_root.join('provision')
       autoload :WaitForServerToStop, action_root.join('wait_stop')
       autoload :WaitForServerToBeActive, action_root.join('wait_active')
+      # TODO: Remove the if guard when Vagrant 1.8.0 is the minimum version.
+      # rubocop:disable IndentationWidth
+      if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0')
+      autoload :SnapshotCleanup, action_root.join('snapshot_cleanup')
+      autoload :SnapshotDelete, action_root.join('snapshot_delete')
+      autoload :SnapshotList, action_root.join('snapshot_list')
+      autoload :SnapshotRestore, action_root.join('snapshot_restore')
+      autoload :SnapshotSave, action_root.join('snapshot_save')
+      end
+      # rubocop:enable IndentationWidth
 
       private
 

data/lib/vagrant-conoha/action/create_server.rb

@@ -72,7 +72,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 +104,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)
 
@@ -143,6 +145,32 @@ module VagrantPlugins
           end
         end
 
+        def assign_floating_ip(env, server_id)
+          floating_ip = @resolver.resolve_floating_ip(env)
+          return if !floating_ip || floating_ip.empty?
+          @logger.info "Using floating IP #{floating_ip}"
+          env[:ui].info(I18n.t('vagrant_openstack.using_floating_ip', floating_ip: floating_ip))
+          env[:openstack_client].nova.add_floating_ip(env, server_id, floating_ip)
+        rescue Errors::UnableToResolveFloatingIP
+          @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-conoha/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-conoha/action/snapshot_cleanup.rb

@@ -0,0 +1,32 @@
+require 'vagrant-conoha/action/abstract_action'
+
+module VagrantPlugins
+  module ConoHa
+    module Action
+      class SnapshotCleanup < AbstractAction
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          nova = env[:openstack_client].nova
+          machine_snapshots = nova.list_snapshots(env, env[:machine].id)
+
+          snapshots_to_clean = machine_snapshots.select do |s|
+            s.metadata.key?('vagrant_snapshot')
+          end
+
+          @app.call env
+
+          unless snapshots_to_clean.empty?
+            env[:ui].info("Deleting Vagrant snapshots: #{snapshots_to_clean.map(&:name)}")
+          end
+
+          snapshots_to_clean.each do |s|
+            nova.delete_snapshot(env, s.id)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-conoha/action/snapshot_delete.rb

@@ -0,0 +1,32 @@
+require 'vagrant-conoha/action/abstract_action'
+
+module VagrantPlugins
+  module ConoHa
+    module Action
+      class SnapshotDelete < AbstractAction
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          nova = env[:openstack_client].nova
+          machine_snapshots = nova.list_snapshots(env, env[:machine].id)
+
+          snapshot = machine_snapshots.find { |s| s.name == env[:snapshot_name] }
+
+          unless snapshot.nil?
+            env[:ui].info(I18n.t('vagrant.actions.vm.snapshot.deleting',
+                                 name: snapshot.name))
+
+            nova.delete_snapshot(env, snapshot.id)
+
+            env[:ui].info(I18n.t('vagrant.actions.vm.snapshot.deleted',
+                                 name: snapshot.name))
+          end
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-conoha/action/snapshot_list.rb

@@ -0,0 +1,22 @@
+require 'vagrant-conoha/action/abstract_action'
+
+module VagrantPlugins
+  module ConoHa
+    module Action
+      class SnapshotList < AbstractAction
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          nova = env[:openstack_client].nova
+          machine_snapshots = nova.list_snapshots(env, env[:machine].id)
+
+          env[:machine_snapshot_list] = machine_snapshots.map(&:name)
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-conoha/action/snapshot_restore.rb

@@ -0,0 +1,29 @@
+require 'vagrant-conoha/action/abstract_action'
+
+module VagrantPlugins
+  module ConoHa
+    module Action
+      class SnapshotRestore < AbstractAction
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          nova = env[:openstack_client].nova
+          machine_snapshots = nova.list_snapshots(env, env[:machine].id)
+
+          snapshot = machine_snapshots.find { |s| s.name == env[:snapshot_name] }
+
+          unless snapshot.nil?
+            env[:ui].info(I18n.t('vagrant.actions.vm.snapshot.restoring',
+                                 name: snapshot.name))
+
+            nova.restore_snapshot(env, env[:machine].id, snapshot.id)
+          end
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-conoha/action/snapshot_save.rb

@@ -0,0 +1,51 @@
+require 'vagrant-conoha/action/abstract_action'
+
+module VagrantPlugins
+  module ConoHa
+    module Action
+      class SnapshotSave < AbstractAction
+        def initialize(app, _env, retry_interval = 3)
+          @app = app
+          @retry_interval = retry_interval
+        end
+
+        def call(env)
+          nova = env[:openstack_client].nova
+          config = env[:machine].provider_config
+
+          env[:ui].info(I18n.t('vagrant.actions.vm.snapshot.saving',
+                               name: env[:snapshot_name]))
+
+          nova.create_snapshot(
+            env,
+            env[:machine].id, env[:snapshot_name])
+
+          image = nova.list_snapshots(env, env[:machine].id).find { |i| i.name == env[:snapshot_name] }
+
+          timeout(config.server_create_timeout, Errors::Timeout) do
+            loop do
+              image_status = nova.get_image_details(env, image.id)
+
+              break if image_status['status'] == 'ACTIVE'
+
+              unless image_status['progress'].nil?
+                env[:ui].clear_line
+                env[:ui].report_progress(image_status['progress'], 100, false)
+              end
+
+              sleep @retry_interval
+            end
+          end
+
+          # Clear progress output.
+          env[:ui].clear_line
+
+          env[:ui].success(I18n.t('vagrant.actions.vm.snapshot.saved',
+                                  name: env[:snapshot_name]))
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-conoha/action/sync_folders.rb

@@ -56,8 +56,6 @@ module VagrantPlugins
           config          = env[:machine].provider_config
           rsync_includes  = config.rsync_includes.to_a
 
-          confirm_rsync_installed(env)
-
           env[:machine].config.vm.synced_folders.each do |_, data|
             hostpath  = File.expand_path(data[:hostpath], env[:root_path])
             guestpath = data[:guestpath]
@@ -123,22 +121,6 @@ module VagrantPlugins
 
         private
 
-        def confirm_rsync_installed(env)
-          # Install rsync if not installed
-          exit_code = env[:machine].communicate.sudo('which rsync', error_check: false)
-          return if exit_code == 0 || exit_code.nil?
-
-          config = env[:machine].provider_config
-
-          if config.image =~ /debian|ubuntu/
-            env[:ui].detail(I18n.t('vagrant_openstack.confirm_rsync_installed'))
-            env[:machine].communicate.sudo('apt-get update && apt-get install -y rsync')
-          elsif config.image =~ /centos/
-            env[:ui].detail(I18n.t('vagrant_openstack.confirm_rsync_installed'))
-            env[:machine].communicate.sudo('yum -y install rsync')
-          end
-        end
-
         def ssh_key_options(ssh_info)
           # Ensure that `private_key_path` is an Array (for Vagrant < 1.4)
           Array(ssh_info[:private_key_path]).map { |path| "-i '#{path}' " }.join

data/lib/vagrant-conoha/cap/snapshot_list.rb

@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module ConoHa
+    module Cap
+      module SnapshotList
+        # Returns a list of the snapshots that are taken on this machine.
+        #
+        # @return [Array<String>]
+        def self.snapshot_list(machine)
+          env = machine.action(:snapshot_list, lock: false)
+          env[:machine_snapshot_list]
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-conoha/client/domain.rb

@@ -25,19 +25,23 @@ module VagrantPlugins
         attr_accessor :size
         attr_accessor :min_ram
         attr_accessor :min_disk
+        attr_accessor :metadata
 
-        def initialize(id, name, visibility = nil, size = nil, min_ram = nil, min_disk = nil)
+        # rubocop:disable Metrics/ParameterLists
+        def initialize(id, name, visibility = nil, size = nil, min_ram = nil, min_disk = nil, metadata = {})
           @visibility = visibility
           @size = size
           @min_ram = min_ram
           @min_disk = min_disk
+          @metadata = metadata
           super(id, name)
         end
+        # rubocop:enable Metrics/ParameterLists
 
         protected
 
         def state
-          [@id, @name, @visibility, @size, @min_ram, @min_disk]
+          [@id, @name, @visibility, @size, @min_ram, @min_disk, @metadata]
         end
       end
 

data/lib/vagrant-conoha/client/nova.rb

@@ -42,9 +42,30 @@ module VagrantPlugins
         FloatingIP.new(floating_ip['ip'], floating_ip['pool'], floating_ip['instance_id'])
       end
 
-      def get_all_images(env)
-        images_json = get(env, "#{@session.endpoints[:compute]}/images")
-        JSON.parse(images_json)['images'].map { |fl| Image.new(fl['id'], fl['name'], 'unknown') }
+      def get_all_images(env, headers = {})
+        images_json = get(env, "#{@session.endpoints[:compute]}/images/detail", headers)
+        JSON.parse(images_json)['images'].map do |fl|
+          Image.new(
+            fl['id'],
+            fl['name'],
+            'unknown',
+            nil,
+            fl['minRam'],
+            fl['minDisk'],
+            fl['metadata']
+          )
+        end
+      end
+
+      # Get detailed information about an image
+      #
+      # @param env [Hash] Vagrant action environment
+      # @param image_id [String] Image UUID
+      #
+      # @return [Hash]
+      def get_image_details(env, image_id)
+        image_json = get(env, "#{@session.endpoints[:compute]}/images/#{image_id}")
+        JSON.parse(image_json)['image']
       end
 
       def create_server(env, options)
@@ -70,7 +91,7 @@ module VagrantPlugins
           s['adminPass'] = options[:admin_pass] unless options[:admin_pass].nil? || options[:admin_pass].empty?
           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?
+          s['user_data'] = Base64.strict_encode64(options[:user_data]) unless options[:user_data].nil?
           s['metadata'] = options[:metadata] unless options[:metadata].nil?
           s['networks'] = options[:networks] unless options[:networks].nil? || options[:networks].empty?
         end
@@ -126,6 +147,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)}"
 
@@ -177,6 +211,63 @@ module VagrantPlugins
         end
       end
 
+      # List snapshot images associated with a particular server
+      #
+      # @param env [Hash] Vagrant action environment
+      # @param server_id [String] Server UUID
+      #
+      # @return [Array<VagrantPlugins::Openstack::Domain::Image>]
+      def list_snapshots(env, server_id)
+        get_all_images(env, params: { server: server_id })
+      end
+
+      # Create a named snapsot for a given VM
+      #
+      # @param env [Hash] Vagrant action environment
+      # @param server_id [String] Server UUID
+      # @param snapshot_name [String]
+      #
+      # @return [void]
+      def create_snapshot(env, server_id, snapshot_name)
+        instance_exists do
+          post(
+            env,
+            "#{@session.endpoints[:compute]}/servers/#{server_id}/action",
+            { createImage: {
+              name: snapshot_name,
+              metadata: { vagrant_snapshot: 'true' }
+            } }.to_json)
+        end
+      end
+
+      # Delete an identified snapshot
+      #
+      # @param env [Hash] Vagrant action environment
+      # @param snapshot_id [String] Snapshot UUID
+      #
+      # @return [void]
+      def delete_snapshot(env, snapshot_id)
+        delete(
+          env,
+          "#{@session.endpoints[:compute]}/images/#{snapshot_id}")
+      end
+
+      # Restore a VM to an identified snapshot
+      #
+      # @param env [Hash] Vagrant action environment
+      # @param server_id [String] Server UUID
+      # @param snapshot_id [String] Snapshot UUID
+      #
+      # @return [void]
+      def restore_snapshot(env, server_id, snapshot_id)
+        instance_exists do
+          post(
+            env,
+            "#{@session.endpoints[:compute]}/servers/#{server_id}/action",
+            { rebuild: { imageRef: snapshot_id } }.to_json)
+        end
+      end
+
       private
 
       VM_STATES =

data/lib/vagrant-conoha/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-conoha/config.rb

@@ -222,6 +222,10 @@ module VagrantPlugins
       # @return [Integer]
       attr_accessor :stack_delete_timeout
 
+      #
+      # @return [Integer]
+      attr_accessor :floating_ip_assign_timeout
+
       #
       # @return [HttpConfig]
       attr_accessor :http
@@ -244,6 +248,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
@@ -288,9 +302,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)
@@ -397,11 +414,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
 
@@ -423,10 +443,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-conoha/config_resolver.rb

@@ -33,9 +33,29 @@ module VagrantPlugins
         resolve_image_internal(env, env[:machine].provider_config.volume_boot[:image])
       end
 
+      def resolve_floating_ip(env)
+        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-conoha/version.rb

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

data/locales/en.yml

@@ -71,6 +71,8 @@ en:
       Installing rsync...
     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-conoha/action/create_server_spec.rb

@@ -108,10 +108,10 @@ describe VagrantPlugins::ConoHa::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(:attach_volumes).with(env, '45678', [{ id: 'vol-01', device: nil }])
-
         @action.call(env)
       end
     end

data/spec/vagrant-conoha/action/read_ssh_info_spec.rb

@@ -42,6 +42,7 @@ describe VagrantPlugins::ConoHa::Action::ReadSSHInfo do
     double('ssh_config').tap do |config|
       config.stub(:username) { 'sshuser' }
       config.stub(:port) { nil }
+      config.stub(:insert_key) { true }
     end
   end
 
@@ -165,6 +166,16 @@ describe VagrantPlugins::ConoHa::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-conoha/client/cinder_spec.rb

@@ -11,6 +11,8 @@ describe VagrantPlugins::ConoHa::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-conoha/client/glance_spec.rb

@@ -11,6 +11,8 @@ describe VagrantPlugins::ConoHa::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-conoha/client/heat_spec.rb

@@ -18,6 +18,8 @@ describe VagrantPlugins::ConoHa::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-conoha/client/keystone_spec.rb

@@ -20,6 +20,8 @@ describe VagrantPlugins::ConoHa::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-conoha/client/neutron_spec.rb

@@ -11,6 +11,8 @@ describe VagrantPlugins::ConoHa::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-conoha/client/nova_spec.rb

@@ -21,6 +21,8 @@ describe VagrantPlugins::ConoHa::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
 
@@ -101,7 +103,7 @@ describe VagrantPlugins::ConoHa::NovaClient do
   describe 'get_all_images' do
     context 'with token and project_id acquainted' do
       it 'returns all images' do
-        stub_request(:get, 'http://nova/a1b2c3/images')
+        stub_request(:get, 'http://nova/a1b2c3/images/detail')
           .with(
             headers:
             {
@@ -110,13 +112,14 @@ describe VagrantPlugins::ConoHa::NovaClient do
             })
           .to_return(
             status: 200,
-            body: '{ "images": [ { "id": "i1", "name": "image1"}, { "id": "i2", "name": "image2"} ] }')
+            body: '{ "images": [ { "id": "i1", "name": "image1", "metadata": {"customVal1": 1}}, { "id": "i2", "name": "image2"} ] }')
 
         images = @nova_client.get_all_images(env)
 
         expect(images.length).to eq(2)
         expect(images[0].id).to eq('i1')
         expect(images[0].name).to eq('image1')
+        expect(images[0].metadata['customVal1']).to eq(1)
         expect(images[1].id).to eq('i2')
         expect(images[1].name).to eq('image2')
       end
@@ -147,7 +150,7 @@ describe VagrantPlugins::ConoHa::NovaClient do
           stub_request(:post, 'http://nova/a1b2c3/servers')
             .with(
               body: '{"server":{"name":"inst","imageRef":"img","flavorRef":"flav","key_name":"key","adminPass":"AdminPass123%",'\
-              '"security_groups":[{"name":"default"}],"user_data":"dXNlcl9kYXRhX3Rlc3Q=\n","metadata":"metadata_test"},'\
+              '"security_groups":[{"name":"default"}],"user_data":"dXNlcl9kYXRhX3Rlc3Q=","metadata":"metadata_test"},'\
               '"os:scheduler_hints":"sched_hints_test"}',
               headers:
               {

data/spec/vagrant-conoha/config_resolver_spec.rb

@@ -93,6 +93,7 @@ describe VagrantPlugins::ConoHa::ConfigResolver do
     double('ssh_config').tap do |config|
       config.stub(:username) { nil }
       config.stub(:port) { nil }
+      config.stub(:insert_key) { true }
     end
   end
 
@@ -397,6 +398,16 @@ describe VagrantPlugins::ConoHa::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-conoha/config_spec.rb

@@ -29,6 +29,7 @@ describe VagrantPlugins::ConoHa::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::ConoHa::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::ConoHa::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::ConoHa::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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-conoha
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Hironobu Saitoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -210,6 +210,11 @@ files:
 - lib/vagrant-conoha/action/read_ssh_info.rb
 - lib/vagrant-conoha/action/read_state.rb
 - lib/vagrant-conoha/action/resume.rb
+- lib/vagrant-conoha/action/snapshot_cleanup.rb
+- lib/vagrant-conoha/action/snapshot_delete.rb
+- lib/vagrant-conoha/action/snapshot_list.rb
+- lib/vagrant-conoha/action/snapshot_restore.rb
+- lib/vagrant-conoha/action/snapshot_save.rb
 - lib/vagrant-conoha/action/start_server.rb
 - lib/vagrant-conoha/action/stop_server.rb
 - lib/vagrant-conoha/action/suspend.rb
@@ -217,6 +222,7 @@ files:
 - lib/vagrant-conoha/action/wait_accessible.rb
 - lib/vagrant-conoha/action/wait_active.rb
 - lib/vagrant-conoha/action/wait_stop.rb
+- lib/vagrant-conoha/cap/snapshot_list.rb
 - lib/vagrant-conoha/catalog/openstack_catalog.rb
 - lib/vagrant-conoha/client/cinder.rb
 - lib/vagrant-conoha/client/domain.rb