vagrant-conoha 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f9e567b352ad7363774274cbea6550bbf01c1dc
-  data.tar.gz: 8c691159e46f9782317a64153f4b48f58e0bd3c6
+  metadata.gz: f5f6d8e918ef420c86161b4975201a0c2a8a7f57
+  data.tar.gz: bfed2b1a52dd42baabdc1d9bea2517372fa166ca
 SHA512:
-  metadata.gz: c5fd61edd482dca4ca1df193b44791ef3b65eb8ab9741c2edad453eda19761a9e313746e286e0d9577a6150f98301032313fe819e65053c5570e9288f264a8d6
-  data.tar.gz: 4c81e34573458debc06ea34d77325717a272b83bad161bf63a736c9bde6b1c53907e132cdc4091057ef485dbb4a15f4da1694e0b367d50c4fc48cdf31dfcb1f2
+  metadata.gz: aa75a9dbdcc1ee891f3b47b7dfea65f4a92790ca6d65e1e49550982da4525e232df65e25c90e202d604c8d5b6b54f1b06d4335f1ca9734f6c115ee8701f43cd4
+  data.tar.gz: 5cd9d0b742944b21262f159c4fc45d0861391162959c35565fde7e3842102e0aabfaabbde21acb7384aa440fe9c06543d19436879d46f0d7d39a899f3b102302

data/CHANGELOG.md

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

data/Gemfile

@@ -3,7 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.9.1'
+  # FIXME: Hack to allow Vagrant v1.6.5 to install for tests. Remove when
+  # support for 1.6.5 is dropped.
+  gem 'rack', '< 2'
   gem 'appraisal', '1.0.0'
   gem 'rubocop', '0.29.0', require: false
   gem 'coveralls', require: false

data/Vagrantfile

@@ -13,10 +13,6 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  # このプラグインではConoHa(OpenStack)のイメージを使用するため、boxは利用できません。
-  # このパラメータを変更する必要はありません。
-  config.vm.box       = 'conoha'
-
   # vagrantがSSH接続する際のユーザ名を指定します。
   config.ssh.username = 'root'
 
@@ -36,8 +32,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     conoha.tenant_name        = 'gnct*******'
 
     # VPSのスペックを指定します(g-1gbの場合は1GBプランになります)。
-    # 2015/08/27現在、以下のプランが利用可能です。
+    # 2017/02/23現在、以下のプランが利用可能です。
     #
+    # g-512mb
     # g-1gb
     # g-2gb
     # g-4gb
@@ -46,7 +43,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # g-32gb
     # g-64gb
     #
-    # 最新のプラン一覧はvagrantのopenstackコマンドで取得できます。
+    # 最新のプラン一覧はvagrantのopenstackサブコマンドで取得できます。
     # 以下のコマンドを実行して下さい。
     #
     # $ vagrant openstack flavor-list
@@ -54,49 +51,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     conoha.flavor             = 'g-1gb'
 
     # VPSのイメージを指定します。
-    # 2015/08/27現在、以下のイメージが利用可能です。
-    #
-    # vmi-archlinux-x86_64
-    # vmi-centos-6.6-i386
-    # vmi-centos-6.6-x86_64
-    # vmi-centos-6.7-i386
-    # vmi-centos-6.7-x86_64
-    # vmi-centos-7.1-x86_64
-    # vmi-concrete5-centos-6.7
-    # vmi-debian-7-amd64
-    # vmi-debian-7-i386
-    # vmi-debian-8-amd64
-    # vmi-debian-8-i386
-    # vmi-docker-1.7.1-ubuntu-14.04
-    # vmi-drupal-7.36-centos-6.6
-    # vmi-fedora-21-x86_64
-    # vmi-fedora-22-x86_64
-    # vmi-freebsd-10.1-x86_64
-    # vmi-freebsd-10.1-zfs-x86_64
-    # vmi-gitlab-7.9.1-centos-6.6
-    # vmi-hadoop-2.6-master-centos-6.6
-    # vmi-hadoop-2.6-slave-centos-6.6
-    # vmi-hinemos-5.0-centos-7.1
-    # vmi-jenkins-1.6-centos-6.6
-    # vmi-lamp-centos-6.6
-    # vmi-meanstack-centos-6.6
-    # vmi-opensuse-13.2-x86_64
-    # vmi-owncloud-8-centos-6.6
-    # vmi-redmine-3.0-centos-6.6
-    # vmi-ror-4.2-centos-6.6
-    # vmi-scientificlinux-7.1-x86_64
-    # vmi-ubuntu-12.04-amd64
-    # vmi-ubuntu-12.04-i386
-    # vmi-ubuntu-14.04-amd64
-    # vmi-ubuntu-14.04-i386
-    # vmi-wp-4.3-centos-6-6
-    #
-    # 最新のイメージ一覧は、vagrantのopenstackコマンドで取得できます。
+    # 最新のイメージ一覧は、vagrantのopenstackサブコマンドで取得できます。
     # 以下のコマンドを実行してください。
     #
     # $ vagrant openstack image-list
     #
-    conoha.image              = 'vmi-ubuntu-14.04-amd64'
+    conoha.image              = 'vmi-ubuntu-16.04-amd64-unified'
 
     # リージョンを指定します。
     # 東京(tyo1)、シンガポール(sin1)、アメリカ(sjc1)から指定して下さい。

data/lib/vagrant-conoha/action.rb

@@ -39,7 +39,13 @@ module VagrantPlugins
               else
                 b2.use Provision
               end
-              b2.use SyncFolders
+              if env[:machine].provider_config.use_legacy_synced_folders
+                env[:machine].ui.warn I18n.t('vagrant_openstack.config.sync_folders_deprecated')
+                b2.use SyncFolders
+              else
+                # Standard Vagrant implementation.
+                b2.use SyncedFolders
+              end
             end
           end
         end
@@ -61,6 +67,7 @@ module VagrantPlugins
       # key.
       def self.action_read_state
         new_builder.tap do |b|
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectOpenstack
           b.use ReadState
@@ -97,6 +104,7 @@ module VagrantPlugins
 
       def self.action_up
         new_builder.tap do |b|
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectOpenstack
 
@@ -111,7 +119,15 @@ module VagrantPlugins
                   b2.use Provision
                 end
               end
-              b2.use SyncFolders
+
+              if env[:machine].provider_config.use_legacy_synced_folders
+                env[:machine].ui.warn I18n.t('vagrant_openstack.config.sync_folders_deprecated')
+                b2.use SyncFolders
+              else
+                # Standard Vagrant implementation.
+                b2.use SyncedFolders
+              end
+
               b2.use CreateStack
               b2.use CreateServer
               b2.use Message, I18n.t('vagrant_openstack.ssh_disabled_provisioning') if ssh_disabled

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

@@ -99,7 +99,7 @@ module VagrantPlugins
             end
           end
 
-          log = "Lauching server '#{server_name}' in project '#{config.tenant_name}' "
+          log = "Launching server '#{server_name}' in project '#{config.tenant_name}' "
           log << "with flavor '#{options[:flavor].name}' (#{options[:flavor].id}), "
           unless options[:image].nil?
             log << "image '#{options[:image].name}' (#{options[:image].id}) "
@@ -132,7 +132,7 @@ module VagrantPlugins
           @logger.info "Waiting for the server with id #{server_id} to be built..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_build'))
           config = env[:machine].provider_config
-          timeout(config.server_create_timeout, Errors::Timeout) do
+          Timeout.timeout(config.server_create_timeout, Errors::Timeout) do
             server_status = 'WAITING'
             until server_status == 'ACTIVE'
               @logger.debug('Waiting for server to be ACTIVE')

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

@@ -60,7 +60,7 @@ module VagrantPlugins
           @logger.info "Waiting for the stack with id #{stack_id} to be built..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_stack'))
           config = env[:machine].provider_config
-          timeout(config.stack_create_timeout, Errors::Timeout) do
+          Timeout.timeout(config.stack_create_timeout, Errors::Timeout) do
             stack_status = 'CREATE_IN_PROGRESS'
             until stack_status == 'CREATE_COMPLETE'
               @logger.debug('Waiting for stack to be CREATED')

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

@@ -32,7 +32,7 @@ module VagrantPlugins
           @logger.info "Waiting for the instance with id #{instance_id} to be deleted..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_deleted'))
           config = env[:machine].provider_config
-          timeout(config.server_delete_timeout, Errors::Timeout) do
+          Timeout.timeout(config.server_delete_timeout, Errors::Timeout) do
             delete_ok = false
             until delete_ok
               begin

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

@@ -57,7 +57,7 @@ module VagrantPlugins
           @logger.info "Waiting for the stack with id #{stack_id} to be deleted..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_stack_deleted'))
           config = env[:machine].provider_config
-          timeout(config.stack_delete_timeout, Errors::Timeout) do
+          Timeout.timeout(config.stack_delete_timeout, Errors::Timeout) do
             stack_status = 'DELETE_IN_PROGRESS'
             until stack_status == 'DELETE_COMPLETE'
               @logger.debug('Waiting for stack to be DELETED')

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

@@ -18,7 +18,7 @@ module VagrantPlugins
             env[:ui].info(I18n.t('vagrant_openstack.waiting_start'))
             client = env[:openstack_client].nova
             config = env[:machine].provider_config
-            timeout(config.server_active_timeout, Errors::Timeout) do
+            Timeout.timeout(config.server_active_timeout, Errors::Timeout) do
               while client.get_server_details(env, env[:machine].id)['status'] != 'ACTIVE'
                 sleep @retry_interval
                 @logger.info('Waiting for server to be active')

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

@@ -18,7 +18,7 @@ module VagrantPlugins
             env[:ui].info(I18n.t('vagrant_openstack.waiting_stop'))
             client = env[:openstack_client].nova
             config = env[:machine].provider_config
-            timeout(config.server_stop_timeout, Errors::Timeout) do
+            Timeout.timeout(config.server_stop_timeout, Errors::Timeout) do
               while client.get_server_details(env, env[:machine].id)['status'] != 'SHUTOFF'
                 sleep @retry_interval
                 @logger.info('Waiting for server to stop')

data/lib/vagrant-conoha/catalog/openstack_catalog.rb

@@ -10,24 +10,16 @@ module VagrantPlugins
           config = env[:machine].provider_config
           client = env[:openstack_client]
           endpoints = client.session.endpoints
-          endpoint_type = config.endpoint_type
           @logger.info(I18n.t('vagrant_openstack.client.looking_for_available_endpoints'))
           @logger.info("Selecting endpoints matching region '#{config.region}'") unless config.region.nil?
 
           catalog.each do |service|
             se = service['endpoints']
-            if config.region.nil?
-              if se.size > 1
-                env[:ui].warn I18n.t('vagrant_openstack.client.multiple_endpoint', size: se.size, type: service['type'])
-                env[:ui].warn "  => #{service['endpoints'][0][endpoint_type]}"
-              end
-              url = se[0][endpoint_type].strip
-            else
-              se.each do |endpoint|
-                url = endpoint[endpoint_type].strip if endpoint['region'].eql? config.region
-              end
+            if config.identity_api_version == '2'
+              get_endpoints_2(env, se, service, config, endpoints)
+            elsif config.identity_api_version == '3'
+              get_interfaces_3(se, service, config, endpoints)
             end
-            endpoints[service['type'].to_sym] = url unless url.nil? || url.empty?
           end
 
           endpoints[:network] = choose_api_version('Neutron', 'openstack_network_url', 'v2') do
@@ -41,6 +33,37 @@ module VagrantPlugins
 
         private
 
+        def get_endpoints_2(env, se, service, config, endpoints)
+          endpoint_type = config.endpoint_type
+          if config.region.nil?
+            if se.size > 1
+              env[:ui].warn I18n.t('vagrant_openstack.client.multiple_endpoint', size: se.size, type: service['type'])
+              env[:ui].warn "  => #{service['endpoints'][0][endpoint_type]}"
+            end
+            url = se[0][endpoint_type].strip
+          else
+            se.each do |endpoint|
+              url = endpoint[endpoint_type].strip if endpoint['region'].eql? config.region
+            end
+          end
+          endpoints[service['type'].to_sym] = url unless url.nil? || url.empty?
+        end
+
+        def get_interfaces_3(se, service, config, endpoints)
+          url = nil
+          se.each do |endpoint|
+            next if endpoint['interface'] != config.interface_type
+            if config.region.nil?
+              url = endpoint['url']
+              break
+            elsif endpoint['region'] == config.region
+              url = endpoint['url']
+              break
+            end
+          end
+          endpoints[service['type'].to_sym] = url unless url.nil? || url.empty?
+        end
+
         def choose_api_version(service_name, url_property, version_prefix = nil, fail_if_not_found = true)
           versions = yield
 

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

@@ -19,20 +19,13 @@ module VagrantPlugins
         config = env[:machine].provider_config
         @logger.info(I18n.t('vagrant_openstack.client.authentication', project: config.tenant_name, user: config.username))
 
-        post_body =
-          {
-            auth:
-              {
-                tenantName: config.tenant_name,
-                passwordCredentials:
-                  {
-                    username: config.username,
-                    password: '****'
-                  }
-              }
-          }
-
-        auth_url = get_auth_url_v2 env
+        if config.identity_api_version == '2'
+          post_body = get_body_2 config
+          auth_url = get_auth_url_2 env
+        elsif config.identity_api_version == '3'
+          post_body = get_body_3 config
+          auth_url = get_auth_url_3 env
+        end
 
         headers = {
           content_type: :json,
@@ -41,13 +34,19 @@ module VagrantPlugins
 
         log_request(:POST, auth_url, post_body.to_json, headers)
 
-        post_body[:auth][:passwordCredentials][:password] = config.password
+        if config.identity_api_version == '2'
+          post_body[:auth][:passwordCredentials][:password] = config.password
+        elsif config.identity_api_version == '3'
+          post_body[:auth][:identity][:password][:user][:password] = config.password
+        end
 
         authentication = RestUtils.post(env, auth_url, post_body.to_json, headers) do |response|
           log_response(response)
           case response.code
           when 200
             response
+          when 201
+            response
           when 401
             fail Errors::AuthenticationFailed
           when 404
@@ -57,17 +56,69 @@ module VagrantPlugins
           end
         end
 
-        access = JSON.parse(authentication)['access']
-        response_token = access['token']
-        @session.token = response_token['id']
-        @session.project_id = response_token['tenant']['id']
-
-        access['serviceCatalog']
+        if config.identity_api_version == '2'
+          access = JSON.parse(authentication)['access']
+          response_token = access['token']
+          @session.token = response_token['id']
+          @session.project_id = response_token['tenant']['id']
+          return access['serviceCatalog']
+        elsif config.identity_api_version == '3'
+          body = JSON.parse(authentication)
+          @session.token = authentication.headers[:x_subject_token]
+          @session.project_id = body['token']['project']['id']
+          return body['token']['catalog']
+        end
       end
 
       private
 
-      def get_auth_url_v2(env)
+      def get_body_2(config)
+        {
+          auth:
+          {
+            tenantName: config.tenant_name,
+            passwordCredentials:
+            {
+              username: config.username,
+              password: '****'
+            }
+          }
+        }
+      end
+
+      def get_body_3(config)
+        {
+          auth:
+          {
+            identity: {
+              methods: ['password'],
+              password: {
+                user: {
+                  name: config.username,
+                  domain: {
+                    name: config.domain_name
+                  },
+                  password: '****'
+                }
+              }
+            },
+            scope: {
+              project: {
+                name: config.project_name,
+                domain: { name: config.domain_name }
+              }
+            }
+          }
+        }
+      end
+
+      def get_auth_url_3(env)
+        url = env[:machine].provider_config.openstack_auth_url
+        return url if url.match(%r{/tokens/*$})
+        "#{url}/auth/tokens"
+      end
+
+      def get_auth_url_2(env)
         url = env[:machine].provider_config.openstack_auth_url
         return url if url.match(%r{/tokens/*$})
         "#{url}/tokens"

data/lib/vagrant-conoha/config.rb

@@ -52,6 +52,11 @@ module VagrantPlugins
       #
       attr_accessor :tenant_name
 
+      #
+      # The name of the openstack project on witch the vm will be created, changed name in v3 identity API.
+      #
+      attr_accessor :project_name
+
       # The name of the server. This defaults to the name of the machine
       # defined by Vagrant (via `config.vm.define`), but can be overriden
       # here.
@@ -62,6 +67,11 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :username
 
+      # The domain name to access Openstack, this defaults to Default.
+      #
+      # @return [String]
+      attr_accessor :domain_name
+
       # The name of the keypair to use.
       #
       # @return [String]
@@ -87,6 +97,8 @@ module VagrantPlugins
 
       # Opt files/directories in to the rsync operation performed by this provider
       #
+      # @deprecated Use standard Vagrant synced folders instead.
+      #
       # @return [Array]
       attr_accessor :rsync_includes
 
@@ -108,12 +120,16 @@ module VagrantPlugins
 
       # Sync folder method. Can be either "rsync" or "none"
       #
+      # @deprecated Use standard Vagrant synced folders instead.
+      #
       # @return [String]
       attr_accessor :sync_method
 
       # Sync folder ignore files. A list of files containing exclude patterns to ignore in the rsync operation
       #  performed by this provider
       #
+      # @deprecated Use standard Vagrant synced folders instead.
+      #
       # @return [Array]
       attr_accessor :rsync_ignore_files
 
@@ -172,6 +188,16 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :endpoint_type
 
+      # Specify the endpoint_type to use : publicL, admin, or internal (default is public)
+      #
+      # @return [String]
+      attr_accessor :interface_type
+
+      # Specify the authentication version to use : 2 or 3 (ddefault is 2()
+      #
+      # @return [String]
+      attr_accessor :identity_api_version
+
       #
       # @return [Integer]
       attr_accessor :server_create_timeout
@@ -204,6 +230,20 @@ module VagrantPlugins
       # @return [Boolean]
       attr_accessor :meta_args_support
 
+      # A switch for enabling the legacy synced folders implementation.
+      #
+      # This defaults to false, but is automatically set to true if any of the
+      # legacy synced folder options are used:
+      #
+      #   - {#rsync_includes}
+      #   - {#rsync_ignore_files}
+      #   - {#sync_method}
+      #
+      # @deprecated Use standard Vagrant synced folders instead.
+      #
+      # @return [Boolean]
+      attr_accessor :use_legacy_synced_folders
+
       def initialize
         @password = UNSET_VALUE
         @openstack_compute_url = UNSET_VALUE
@@ -213,6 +253,8 @@ module VagrantPlugins
         @openstack_image_url = UNSET_VALUE
         @openstack_auth_url = UNSET_VALUE
         @endpoint_type = UNSET_VALUE
+        @interface_type = UNSET_VALUE
+        @identity_api_version = UNSET_VALUE
         @region = UNSET_VALUE
         @flavor = UNSET_VALUE
         @image = UNSET_VALUE
@@ -248,6 +290,7 @@ module VagrantPlugins
         @stack_delete_timeout = UNSET_VALUE
         @meta_args_support = UNSET_VALUE
         @http = HttpConfig.new
+        @use_legacy_synced_folders = UNSET_VALUE
       end
 
       def merge(other)
@@ -288,7 +331,7 @@ module VagrantPlugins
         result
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       def finalize!
         @password = nil if @password == UNSET_VALUE
         @openstack_compute_url = nil if @openstack_compute_url == UNSET_VALUE
@@ -298,19 +341,20 @@ module VagrantPlugins
         @openstack_image_url = nil if @openstack_image_url == UNSET_VALUE
         @openstack_auth_url = nil if @openstack_auth_url == UNSET_VALUE
         @endpoint_type = 'publicURL' if @endpoint_type == UNSET_VALUE
+        @interface_type = 'public' if @interface_type == UNSET_VALUE
+        @identity_api_version = '2' if @identity_api_version == UNSET_VALUE
         @region = nil if @region == UNSET_VALUE
         @flavor = nil if @flavor == UNSET_VALUE
         @image = nil if @image == UNSET_VALUE
         @volume_boot = nil if @volume_boot == UNSET_VALUE
         @tenant_name = nil if @tenant_name == UNSET_VALUE
+        @project_name = nil if @project_name == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
-        @rsync_includes = nil if @rsync_includes.empty?
-        @rsync_ignore_files = nil if @rsync_ignore_files.empty?
+        @domain_name = 'Default' if @domain_name == UNSET_VALUE
         @floating_ip = nil if @floating_ip == UNSET_VALUE
         @floating_ip_pool = nil if @floating_ip_pool == UNSET_VALUE
         @floating_ip_pool_always_allocate = false if floating_ip_pool_always_allocate == UNSET_VALUE
-        @sync_method = 'rsync' if @sync_method == UNSET_VALUE
         @keypair_name = nil if @keypair_name == UNSET_VALUE
         @admin_pass = nil if @admin_pass == UNSET_VALUE
         @public_key_path = nil if @public_key_path == UNSET_VALUE
@@ -321,6 +365,27 @@ module VagrantPlugins
         @metadata = nil if @metadata == UNSET_VALUE
         @ssh_disabled = false if @ssh_disabled == UNSET_VALUE
 
+        # The value of use_legacy_synced_folders is used by action chains
+        # to determine which synced folder implementation to run.
+        if @use_legacy_synced_folders == UNSET_VALUE
+          @use_legacy_synced_folders = !(
+            (@rsync_includes.nil? || @rsync_includes.empty?) &&
+            (@rsync_ignore_files.nil? || @rsync_ignore_files.empty?) &&
+            (@sync_method.nil? || @sync_method == UNSET_VALUE))
+        end
+
+        if @use_legacy_synced_folders
+          # Original defaults.
+          @rsync_includes = nil if @rsync_includes.empty?
+          @rsync_ignore_files = nil if @rsync_ignore_files.empty?
+          @sync_method = 'rsync' if @sync_method == UNSET_VALUE
+        else
+          # Disable all sync settings.
+          @rsync_includes = nil
+          @rsync_ignore_files = nil
+          @sync_method = nil
+        end
+
         # The SSH values by default are nil, and the top-level config
         # `config.ssh` and `config.vm.boot_timeout` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
@@ -338,8 +403,10 @@ module VagrantPlugins
         @stacks = nil if @stacks.empty?
         @http.finalize!
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
 
+      #
+      # @deprecated Use standard Vagrant synced folders instead.
       def rsync_include(inc)
         @rsync_includes << inc
       end
@@ -349,13 +416,12 @@ module VagrantPlugins
 
         errors << I18n.t('vagrant_openstack.config.password_required') if @password.nil? || @password.empty?
         errors << I18n.t('vagrant_openstack.config.username_required') if @username.nil? || @username.empty?
-        errors << I18n.t('vagrant_openstack.config.tenant_name_required') if @tenant_name.nil? || @tenant_name.empty?
-        errors << I18n.t('vagrant_openstack.config.invalid_endpoint_type') unless  %w(publicURL adminURL internalURL).include?(@endpoint_type)
+        errors << I18n.t('vagrant_openstack.config.invalid_api_version') unless  %w(2 3).include?(@identity_api_version)
 
+        validate_api_version(errors)
         validate_ssh_username(machine, errors)
         validate_stack_config(errors)
         validate_ssh_timeout(errors)
-        validate_admin_pass(errors)
 
         if machine.config.ssh.private_key_path
           puts I18n.t('vagrant_openstack.config.keypair_name_required').yellow unless @keypair_name || @public_key_path
@@ -379,11 +445,15 @@ module VagrantPlugins
 
       private
 
-      def validate_admin_pass(errors)
-        return if @admin_pass == '' || @admin_pass.nil?
-
-        reg = /\A(?=.*?[A-Z])(?=.*?[a-z])(?=.*?\d)(?=.*?[!-~&&[^A-Za-z\d]])[!-~]{9,70}+\z/
-        errors << I18n.t('vagrant_openstack.config.invalid_admin_pass') unless @admin_pass =~ reg
+      def validate_api_version(errors)
+        if @identity_api_version == '2'
+          errors << I18n.t('vagrant_openstack.config.tenant_name_required') if @tenant_name.nil? || @tenant_name.empty?
+          errors << I18n.t('vagrant_openstack.config.invalid_endpoint_type') unless  %w(publicURL adminURL internalURL).include?(@endpoint_type)
+        elsif @identity_api_version == '3'
+          errors << I18n.t('vagrant_openstack.config.domain_required') if @domain_name.nil? || @domain_name.empty?
+          errors << I18n.t('vagrant_openstack.config.project_name_required') if @project_name.nil? || @project_name.empty?
+          errors << I18n.t('vagrant_openstack.config.invalid_interface_type') unless  %w(public admin internal).include?(@interface_type)
+        end
       end
 
       def validate_stack_config(errors)

data/lib/vagrant-conoha/utils.rb

@@ -16,7 +16,12 @@ module VagrantPlugins
         if addresses.size == 1
           net_addresses = addresses.first[1]
         else
-          net_addresses = addresses[env[:machine].provider_config.networks[0]]
+          first_network = env[:machine].provider_config.networks[0]
+          if first_network.is_a? String
+            net_addresses = addresses[first_network]
+          else
+            net_addresses = addresses[first_network[:name]]
+          end
         end
         fail Errors::UnableToResolveIP if net_addresses.size == 0
         net_addresses[0]['addr']

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

data/lib/vagrant-conoha/version_checker.rb

@@ -65,7 +65,7 @@ module VagrantPlugins
 
     # rubocop:disable Lint/HandleExceptions
     def self.check_version
-      timeout(3, Errors::Timeout) do
+      Timeout.timeout(3, Errors::Timeout) do
         VersionChecker.instance.check
       end
     rescue

data/locales/en.yml

@@ -140,8 +140,19 @@ en:
         to the standard vagrant configuration option `config.vm.boot_timeout`.
       invalid_value_for_parameter: |-
         Invalid value '%{value}' for parameter '%{parameter}'
-      invalid_admin_pass: |-
-        admin_pass must be contain at least 9 characters, least 1 number and both lower and uppercase letters, and specialcharacters.
+      sync_folders_deprecated: |-
+        The following configuration settings are deprecated and should be
+        removed: rsync_includes, rsync_ignore_files, sync_method. Using these
+        settings causes the OpenStack provider to fall back to an old synced
+        folder implementation instead of using standard Vagrant synced folders.
+      domain_required: |-
+        A domain is required when using identity API version 3
+      project_name_required: |-
+        A project name is required when using identity API version 3
+      invalid_interface_type: |-
+        Interface type must be public, admin or internal (if not provided, default is public)
+      invalid_api_version: |-
+        identity API verison must be 2 or 3 (if nto provided, default is 2)
 
     errors:
       default: |-

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

@@ -18,10 +18,13 @@ describe VagrantPlugins::ConoHa::Action::ConnectOpenstack do
       config.stub(:openstack_volume_url) { nil }
       config.stub(:openstack_image_url) { nil }
       config.stub(:tenant_name) { 'testTenant' }
+      config.stub(:project_name) { 'testTenant' }
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
       config.stub(:region) { nil }
       config.stub(:endpoint_type) { 'publicURL' }
+      config.stub(:interface_type) { 'public' }
+      config.stub(:identity_api_version) { '2' }
     end
   end
 
@@ -243,6 +246,78 @@ describe VagrantPlugins::ConoHa::Action::ConnectOpenstack do
       end
     end
 
+    context 'with one endpoint by service v3' do
+      it 'read service catalog and stores endpoints URL in session v3' do
+        catalog = [
+          {
+            'endpoints' => [
+              {
+                'url' => 'http://nova/v2/projectId',
+                'interface' => 'public',
+                'region' => 'RegionOne',
+                'id' => '1'
+              }
+            ],
+            'type' => 'compute',
+            'name' => 'nova'
+          },
+          {
+            'endpoints' => [
+              {
+                'url' => 'http://neutron',
+                'interface' => 'public',
+                'region' => 'RegionOne',
+                'id' => '2'
+              }
+            ],
+            'type' => 'network',
+            'name' => 'neutron'
+          },
+          {
+            'endpoints' => [
+              {
+                'url' => 'http://cinder/v2/projectId',
+                'interface' => 'public',
+                'region' => 'RegionOne',
+                'id' => '2'
+              }
+            ],
+            'type' => 'volume',
+            'name' => 'cinder'
+          },
+          {
+            'endpoints' => [
+              {
+                'url' => 'http://glance',
+                'interface' => 'public',
+                'region' => 'RegionOne',
+                'id' => '2'
+              }
+            ],
+            'type' => 'image',
+            'name' => 'glance'
+          }
+        ]
+
+        double.tap do |keystone|
+          keystone.stub(:authenticate).with(anything) { catalog }
+          env[:openstack_client].stub(:keystone) { keystone }
+        end
+        env[:openstack_client].stub(:neutron)  { neutron }
+        env[:openstack_client].stub(:glance)   { glance }
+        config.stub(:domain_name) { 'dummy' }
+        config.stub(:identity_api_version) { '3' }
+
+        @action.call(env)
+
+        expect(env[:openstack_client].session.endpoints)
+          .to eq(compute: 'http://nova/v2/projectId',
+                 network: 'http://neutron/v2.0',
+                 volume:  'http://cinder/v2/projectId',
+                 image:   'http://glance/v2.0')
+      end
+    end
+
     context 'with multiple regions' do
       it 'read service catalog and stores endpoints URL for desired regions in session' do
         catalog = [

data/spec/vagrant-conoha/client/keystone_spec.rb

@@ -17,6 +17,9 @@ describe VagrantPlugins::ConoHa::KeystoneClient do
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
       config.stub(:http) { http }
+      config.stub(:interface_type) { 'public' }
+      config.stub(:identity_api_version) { '2' }
+      config.stub(:project_name) { 'testTenant' }
     end
   end
 
@@ -52,6 +55,29 @@ describe VagrantPlugins::ConoHa::KeystoneClient do
        ]}}'
     end
 
+    let(:keystone_response_headers_v3) do
+      {
+        'Accept' => 'application/json',
+        'Content-Type' => 'application/json',
+        'x_subject_token' => '0123456789'
+      }
+    end
+
+    let(:keystone_request_body_v3) do
+      '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"username","domain":'\
+      '{"name":"dummy"},"password":"password"}}},"scope":{"project":{"name":"testTenant","domain":'\
+      '{"name":"dummy"}}}}}'
+    end
+
+    let(:keystone_response_body_v3) do
+      '{"token":{"is_domain":false,"methods":["password"],"roles":[{"id":"1234","name":"_member_"}],
+        "is_admin_project":false,"project":{"domain":{"id":"1234","name":"dummy"},"id":"012345678910",
+        "name":"testTenantId"},"catalog":[
+         {"endpoints":[{"id":"eid1","interface":"public","url":"http://nova"}],"type":"compute"},
+         {"endpoints":[{"id":"eid2","interface":"public","url":"http://neutron"}],"type":"network"}
+       ]}}'
+    end
+
     before :each do
       @keystone_client = VagrantPlugins::ConoHa.keystone
     end
@@ -146,5 +172,53 @@ describe VagrantPlugins::ConoHa::KeystoneClient do
         end
       end
     end
+
+    # V3
+    context 'with good credentials v3' do
+      it 'store token and tenant id' do
+        config.stub(:domain_name) { 'dummy' }
+        config.stub(:identity_api_version) { '3' }
+        config.stub(:openstack_auth_url) { 'http://keystoneAuthV3' }
+
+        stub_request(:post, 'http://keystoneAuthV3/auth/tokens')
+          .with(
+            body: keystone_request_body_v3,
+            headers: keystone_request_headers)
+          .to_return(
+            status: 200,
+            body: keystone_response_body_v3,
+            headers: keystone_response_headers_v3)
+
+        @keystone_client.authenticate(env)
+
+        session.token.should eq('0123456789')
+        session.project_id.should eq('012345678910')
+      end
+    end
+
+    context 'with wrong credentials v3' do
+      it 'raise an unauthorized error ' do
+        config.stub(:domain_name) { 'dummy' }
+        config.stub(:identity_api_version) { '3' }
+        config.stub(:openstack_auth_url) { 'http://keystoneAuthV3' }
+
+        stub_request(:post, 'http://keystoneAuthV3/auth/tokens')
+          .with(
+            body: keystone_request_body_v3,
+            headers: keystone_request_headers)
+          .to_return(
+            status: 401,
+            body: '{
+                "error": {
+                  "message": "The request you have made requires authentication.",
+                  "code": 401,
+                  "title": "Unauthorized"
+               }
+              }',
+            headers: keystone_response_headers_v3)
+
+        expect { @keystone_client.authenticate(env) }.to raise_error(Errors::AuthenticationFailed)
+      end
+    end
   end
 end

data/spec/vagrant-conoha/client/nova_spec.rb

@@ -460,7 +460,7 @@ describe VagrantPlugins::ConoHa::NovaClient do
           {
             'Accept' => 'application/json',
             'Accept-Encoding' => 'gzip, deflate',
-            'User-Agent' => 'Ruby',
+            'User-Agent' => /.*/,
             'X-Auth-Token' => '123456'
           })
           .to_return(status: 200, body: '

data/spec/vagrant-conoha/config_spec.rb

@@ -16,7 +16,10 @@ describe VagrantPlugins::ConoHa::Config do
     its(:image)    { should be_nil }
     its(:server_name) { should be_nil }
     its(:username) { should be_nil }
+    its(:use_legacy_synced_folders) { should eq(false) }
     its(:rsync_includes) { should be_nil }
+    its(:rsync_ignore_files) { should be_nil }
+    its(:sync_method) { should be_nil }
     its(:keypair_name) { should be_nil }
     its(:public_key_path) { should be_nil }
     its(:availability_zone) { should be_nil }
@@ -55,11 +58,36 @@ describe VagrantPlugins::ConoHa::Config do
       end
     end
 
+    describe 'use_legacy_synced_folders' do
+      it 'should default to true if sync_method is set' do
+        subject.sync_method = 'rsync'
+        subject.finalize!
+
+        expect(subject.use_legacy_synced_folders).to eq(true)
+      end
+
+      it 'should default to true if rsync_includes is non-empty' do
+        subject.rsync_includes = ['some/file']
+        subject.finalize!
+
+        expect(subject.use_legacy_synced_folders).to eq(true)
+      end
+
+      it 'should default to true if rsync_ignore_files is non-empty' do
+        subject.rsync_ignore_files = ['some/file']
+        subject.finalize!
+
+        expect(subject.use_legacy_synced_folders).to eq(true)
+      end
+    end
+
     it 'should not default rsync_includes if overridden' do
       inc = 'core'
       subject.send(:rsync_include, inc)
       subject.finalize!
-      subject.send(:rsync_includes).should include(inc)
+
+      expect(subject.rsync_includes).to include(inc)
+      expect(subject.use_legacy_synced_folders).to eq(true)
     end
   end
 

data/vagrant-conoha.gemspec

@@ -12,13 +12,15 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/hironobu-s/vagrant-conoha/'
   gem.license       = 'MIT'
 
-  gem.add_dependency 'json', '1.8.3'
-  gem.add_dependency 'rest-client', '~> 1.6.0'
+  gem.add_dependency 'json', '>= 1.8.1', '< 3.0'
+  gem.add_dependency 'rest-client', '>= 1.6.0', '< 3.0'
   gem.add_dependency 'terminal-table', '1.4.5'
   gem.add_dependency 'sshkey', '1.6.1'
   gem.add_dependency 'colorize', '0.7.3'
 
-  gem.add_development_dependency 'rake'
+  # Constraint rake to properly handle deprecated method usage
+  # from within rspec 3.1.z
+  gem.add_development_dependency 'rake', '~> 11.3.0'
   gem.add_development_dependency 'rspec', '~> 3.1.0'
   gem.add_development_dependency 'rspec-its', '~> 1.0.1'
   gem.add_development_dependency 'rspec-expectations', '~> 3.1.2'

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-conoha
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Hironobu Saitoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +96,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -300,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage VPS in ConoHa.