vagrant-openstack-provider 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fcb72c6f544989dbe6afa13b2320eb81f35505e
-  data.tar.gz: 5f04da4d1e21da40d5d7ad6bb83e471e654292f6
+  metadata.gz: 79d085018733ba06b31b2f7fb8f904a29db8040b
+  data.tar.gz: 263505f7c34eb0c3456f00794fe5158076cc6654
 SHA512:
-  metadata.gz: b4427ad7ce03abf95ebbc7f1dabc6188d66cb5daf5a8c5b07f9ff21c6bc44b8fdb62767ff4549bdb99c26bca4b775aad0d648d7df13865420e2ec440217705b9
-  data.tar.gz: 98450beaed75447f516f1be64dd46b399d6aa4e856d999a01f213fe7a0594693fe74d6108034efd1f200d191e0d597e637c7147a057752304a0295e48bc0d28e
+  metadata.gz: c544a9afd69438fe6a0d4b63e3d283c241c890fab6a334ba0ef4d95bb9411516f715af9494313bc3b811e32371e8624b378ec0dece4060448fd8d2c90b759837
+  data.tar.gz: 670e6af16eeb1b62312518ef589bf12eb6b38ee8d4f44147a47b3c4eecdfd997f76e813459b39c5f1be722286c495cdb61ab516b18ae3ef682230faa0b82cb0a

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.6.1 (January 30, 2015)
+
+IMPROVEMENTS:
+
+  - Straightforward syntax to define single networks [#193](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/193)
+  - Network preference for SSH [#194](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/194)
+  - Allow lists in flavor values [#189](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/189)
+  - Allow "wait active" timeout to be configurable [#185](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/185)
+  - Allow setting timeout value for REST calls [#183](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/183)
+
+BUG FIXES:
+
+  - Vagrant openstack reset fails when the instance is not found [#195](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/195)
+  - Show explicit error when tenant is missing in credentials [#186](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/186)
+
 # 0.6.0 (November 28, 2014)
 
 FEATURES:

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/openstack'

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

@@ -127,10 +127,11 @@ module VagrantPlugins
           nova.create_server(env, create_opts)
         end
 
-        def waiting_for_server_to_be_built(env, server_id, retry_interval = 3, timeout = 200)
+        def waiting_for_server_to_be_built(env, server_id, retry_interval = 3)
           @logger.info "Waiting for the server with id #{server_id} to be built..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_build'))
-          timeout(timeout, Errors::Timeout) do
+          config = env[:machine].provider_config
+          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-openstack-provider/action/create_stack.rb

@@ -48,10 +48,11 @@ module VagrantPlugins
 
         private
 
-        def waiting_for_stack_to_be_created(env, stack_name, stack_id, retry_interval = 3, timeout = 200)
+        def waiting_for_stack_to_be_created(env, stack_name, stack_id, retry_interval = 3)
           @logger.info "Waiting for the stack with id #{stack_id} to be built..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_stack'))
-          timeout(timeout, Errors::Timeout) do
+          config = env[:machine].provider_config
+          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-openstack-provider/action/delete_server.rb

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

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

@@ -53,10 +53,11 @@ module VagrantPlugins
           stack_files
         end
 
-        def waiting_for_stack_to_be_deleted(env, stack_name, stack_id, retry_interval = 3, timeout = 200)
+        def waiting_for_stack_to_be_deleted(env, stack_name, stack_id, retry_interval = 3)
           @logger.info "Waiting for the stack with id #{stack_id} to be deleted..."
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_stack_deleted'))
-          timeout(timeout, Errors::Timeout) do
+          config = env[:machine].provider_config
+          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-openstack-provider/action/wait_active.rb

@@ -7,18 +7,18 @@ module VagrantPlugins
   module Openstack
     module Action
       class WaitForServerToBeActive < AbstractAction
-        def initialize(app, _env, retry_interval = 3, timeout = 200)
+        def initialize(app, _env, retry_interval = 3)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::start_server')
           @retry_interval = retry_interval
-          @timeout = timeout
         end
 
         def execute(env)
           if env[:machine].id
             env[:ui].info(I18n.t('vagrant_openstack.waiting_start'))
             client = env[:openstack_client].nova
-            timeout(@timeout, Errors::Timeout) do
+            config = env[:machine].provider_config
+            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-openstack-provider/action/wait_stop.rb

@@ -7,18 +7,18 @@ module VagrantPlugins
   module Openstack
     module Action
       class WaitForServerToStop < AbstractAction
-        def initialize(app, _env, retry_interval = 3, timeout = 200)
+        def initialize(app, _env, retry_interval = 3)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::stop_server')
           @retry_interval = retry_interval
-          @timeout = timeout
         end
 
         def execute(env)
           if env[:machine].id
             env[:ui].info(I18n.t('vagrant_openstack.waiting_stop'))
             client = env[:openstack_client].nova
-            timeout(@timeout, Errors::Timeout) do
+            config = env[:machine].provider_config
+            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-openstack-provider/catalog/openstack_catalog.rb

@@ -10,6 +10,7 @@ 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?
 
@@ -18,23 +19,23 @@ module VagrantPlugins
             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]['publicURL']}"
+                env[:ui].warn "  => #{service['endpoints'][0][endpoint_type]}"
               end
-              url = se[0]['publicURL'].strip
+              url = se[0][endpoint_type].strip
             else
               se.each do |endpoint|
-                url = endpoint['publicURL'].strip if endpoint['region'].eql? config.region
+                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
 
           endpoints[:network] = choose_api_version('Neutron', 'openstack_network_url', 'v2') do
-            client.neutron.get_api_version_list(:network)
+            client.neutron.get_api_version_list(env, :network)
           end if config.openstack_network_url.nil? && !endpoints[:network].nil?
 
           endpoints[:image] = choose_api_version('Glance', 'openstack_image_url', nil, false) do
-            client.glance.get_api_version_list(:image)
+            client.glance.get_api_version_list(env)
           end if config.openstack_image_url.nil? && !endpoints[:image].nil?
         end
 

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/http_utils'

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 module VagrantPlugins

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

@@ -1,8 +1,8 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/http_utils'
+require 'vagrant-openstack-provider/client/rest_utils'
 require 'vagrant-openstack-provider/client/domain'
 
 module VagrantPlugins
@@ -17,8 +17,10 @@ module VagrantPlugins
         @session = VagrantPlugins::Openstack.session
       end
 
-      def get_api_version_list(_env)
-        json = RestClient.get(@session.endpoints[:image], 'X-Auth-Token' => @session.token, :accept => :json) do |response|
+      def get_api_version_list(env)
+        json = RestUtils.get(env, @session.endpoints[:image],
+                             'X-Auth-Token' => @session.token,
+                             :accept => :json) do |response|
           log_response(response)
           case response.code
           when 200, 300

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/http_utils'

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

@@ -1,9 +1,9 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/keystone'
 require 'vagrant-openstack-provider/client/request_logger'
+require 'vagrant-openstack-provider/client/rest_utils'
 
 module VagrantPlugins
   module Openstack
@@ -19,7 +19,7 @@ module VagrantPlugins
         log_request(:GET, url, headers)
 
         authenticated(env) do
-          RestClient.get(url, headers) { |res| handle_response(res) }.tap do
+          RestUtils.get(env, url, headers) { |res| handle_response(res) }.tap do
             @logger.debug("#{calling_method} - end")
           end
         end
@@ -34,7 +34,7 @@ module VagrantPlugins
         log_request(:POST, url, body, headers)
 
         authenticated(env) do
-          RestClient.post(url, body, headers) { |res| handle_response(res) }.tap do
+          RestUtils.post(env, url, body, headers) { |res| handle_response(res) }.tap do
             @logger.debug("#{calling_method} - end")
           end
         end
@@ -49,17 +49,18 @@ module VagrantPlugins
         log_request(:DELETE, url, headers)
 
         authenticated(env) do
-          RestClient.delete(url, headers) { |res| handle_response(res) }.tap do
+          RestUtils.delete(env, url, headers) { |res| handle_response(res) }.tap do
             @logger.debug("#{calling_method} - end")
           end
         end
       end
 
-      def get_api_version_list(service_type)
+      def get_api_version_list(env, service_type)
         url = @session.endpoints[service_type]
         headers = { 'X-Auth-Token' => @session.token, :accept => :json }
         log_request(:GET, url, headers)
-        json = RestClient.get(url, headers) do |response|
+
+        json = RestUtils.get(env, url, headers) do |response|
           log_response(response)
           case response.code
           when 200, 300

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/request_logger'
@@ -37,9 +36,11 @@ module VagrantPlugins
 
         post_body[:auth][:passwordCredentials][:password] = config.password
 
-        authentication = RestClient.post(config.openstack_auth_url, post_body.to_json,
-                                         content_type: :json,
-                                         accept: :json) do |response|
+        authentication = RestUtils.post(env, config.openstack_auth_url, post_body.to_json,
+                                        content_type: :json,
+                                        accept: :json,
+                                        timeout: config.http.read_timeout,
+                                        open_timeout: config.http.open_timeout) do |response|
           log_response(response)
           case response.code
           when 200

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/http_utils'

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/http_utils'

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 require 'vagrant-openstack-provider/client/heat'

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

@@ -1,5 +1,4 @@
 require 'log4r'
-require 'restclient'
 require 'json'
 
 module VagrantPlugins

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

@@ -0,0 +1,25 @@
+require 'restclient'
+
+module VagrantPlugins
+  module Openstack
+    module RestUtils
+      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)
+      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)
+      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)
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module VagrantPlugins
             env[:ui] = @env.ui
           end
 
-          VagrantPlugins::Openstack::Action::ConnectOpenstack.new(nil, env).call(env)
+          before_cmd(name, @argv, env)
 
           cmd(name, @argv, env)
           @env.ui.info('')
@@ -38,6 +38,9 @@ module VagrantPlugins
           args
         end
 
+        def before_cmd(_name, _argv, _env)
+        end
+
         def cmd(_name, _argv, _env)
           fail 'Command not implemented. \'cmd\' method must be overridden in all subclasses'
         end

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

@@ -1,15 +1,13 @@
-require 'vagrant-openstack-provider/command/utils'
-require 'vagrant-openstack-provider/command/abstract_command'
+require 'vagrant-openstack-provider/command/openstack_command'
 
 module VagrantPlugins
   module Openstack
     module Command
-      class FlavorList < AbstractCommand
-        include VagrantPlugins::Openstack::Command::Utils
-
+      class FlavorList < OpenstackCommand
         def self.synopsis
           I18n.t('vagrant_openstack.command.flavor_list_synopsis')
         end
+
         def cmd(name, argv, env)
           fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
           flavors = env[:openstack_client].nova.get_all_flavors(env)

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

@@ -1,15 +1,13 @@
-require 'vagrant-openstack-provider/command/utils'
-require 'vagrant-openstack-provider/command/abstract_command'
+require 'vagrant-openstack-provider/command/openstack_command'
 
 module VagrantPlugins
   module Openstack
     module Command
-      class FloatingIpList < AbstractCommand
-        include VagrantPlugins::Openstack::Command::Utils
-
+      class FloatingIpList < OpenstackCommand
         def self.synopsis
           I18n.t('vagrant_openstack.command.flaotingip_list_synopsis')
         end
+
         def cmd(name, argv, env)
           fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
 

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

@@ -1,15 +1,13 @@
-require 'vagrant-openstack-provider/command/utils'
-require 'vagrant-openstack-provider/command/abstract_command'
+require 'vagrant-openstack-provider/command/openstack_command'
 
 module VagrantPlugins
   module Openstack
     module Command
-      class ImageList < AbstractCommand
-        include VagrantPlugins::Openstack::Command::Utils
-
+      class ImageList < OpenstackCommand
         def self.synopsis
           I18n.t('vagrant_openstack.command.image_list_synopsis')
         end
+
         def cmd(name, argv, env)
           fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
           rows = []

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

@@ -1,15 +1,13 @@
-require 'vagrant-openstack-provider/command/utils'
-require 'vagrant-openstack-provider/command/abstract_command'
+require 'vagrant-openstack-provider/command/openstack_command'
 
 module VagrantPlugins
   module Openstack
     module Command
-      class NetworkList < AbstractCommand
-        include VagrantPlugins::Openstack::Command::Utils
-
+      class NetworkList < OpenstackCommand
         def self.synopsis
           I18n.t('vagrant_openstack.command.network_list_synopsis')
         end
+
         def cmd(name, argv, env)
           fail Errors::UnrecognizedArgForCommand, cmd: name, arg: argv[1] if argv.size > 1
           if argv.size == 0