vagrant-openstack-provider 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d085018733ba06b31b2f7fb8f904a29db8040b
-  data.tar.gz: 263505f7c34eb0c3456f00794fe5158076cc6654
+  metadata.gz: 36585a8dacc29b73947055b81be3b41c1c7fd9ef
+  data.tar.gz: 74481f1a768d1438f31d2ef73a76fc2e2d06961b
 SHA512:
-  metadata.gz: c544a9afd69438fe6a0d4b63e3d283c241c890fab6a334ba0ef4d95bb9411516f715af9494313bc3b811e32371e8624b378ec0dece4060448fd8d2c90b759837
-  data.tar.gz: 670e6af16eeb1b62312518ef589bf12eb6b38ee8d4f44147a47b3c4eecdfd997f76e813459b39c5f1be722286c495cdb61ab516b18ae3ef682230faa0b82cb0a
+  metadata.gz: a1483cf07c6d36599a99b441b20bc1f5db2f74df01723e88b6a766b89fd8a5353b3725f9b0427dd93b04d2dcb6b9775e7363e89e781fca8fbd3fb3fdf9ae21ff
+  data.tar.gz: 751776de2b6099cc462e7db5980f1f6aea185e7b361549cc07c7f0eab1ae4729cfbd6938ca8d5ca47d690334bc0794be1ecdeb31c9ae984ac31c73b964bbf5e9

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Exclude:
     - 'out/**/*'
+    - '**/Vagrantfile'
 
 Style/FileName:
   Enabled: false
@@ -11,18 +12,24 @@ Style/Encoding:
 Style/Documentation:
   Enabled: false
 
-Style/ClassLength:
+Metrics/ClassLength:
   Max: 300
 
-Style/CyclomaticComplexity:
+Metrics/CyclomaticComplexity:
   Severity: warning
   Max: 15
 
-Style/MethodLength:
+Metrics/MethodLength:
   Max: 60
 
-Style/LineLength:
+Metrics/LineLength:
   Max: 150
 
-Style/ParameterLists:
+Metrics/ParameterLists:
   Max: 6
+
+Metrics/AbcSize:
+  Max: 110
+
+Metrics/PerceivedComplexity:
+  Max: 45

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 0.7.0 (August, 10, 2015)
+  
+FEATURES:
+
+  - Access to obtained floating IP from provisioner phase [#205](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/205) 
+
+IMPROVEMENTS:
+
+  - Autodetect new version of the provider and provide info message to update [#132](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/132)
+  - Documentation for the `ssh_timeout` option [#230](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/230) 
+
+BUG FIXES:
+
+  - scheduler_hints ignored due to incorrect json tag in create request [#231](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/231) 
+  - delete_keypair_if_vagrant throws exception if key_name is missing [#238](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/238) 
+  - Fix Vagrant 1.4 bug, extra_data attr not found [#211](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/211) 
+  - Add suffix /tokens in auth url if missing [#208](https://github.com/ggiamarchi/vagrant-openstack-provider/pull/208) 
+
 # 0.6.1 (January 30, 2015)
 
 IMPROVEMENTS:

data/Gemfile

@@ -5,8 +5,9 @@ gemspec
 group :development do
   gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.6.5'
   gem 'appraisal', '1.0.0'
-  gem 'rubocop', '0.23.0', require: false
+  gem 'rubocop', '0.29.0', require: false
   gem 'coveralls', require: false
+  gem 'rspec-its'
 end
 
 group :debug do
@@ -14,5 +15,5 @@ group :debug do
 end
 
 group :plugins do
-  gem "vagrant-openstack-provider", path: "."
+  gem 'vagrant-openstack-provider', path: '.'
 end

data/{LICENSE.txt → LICENSE}

@@ -1,4 +1,5 @@
 Copyright (c) 2013 Mitchell Hashimoto
+Copyright (c) 2015 Guillaume Giamarchi, Julien Vey
 
 MIT License
 
@@ -19,4 +20,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -33,7 +33,7 @@ module VagrantPlugins
             if env[:machine_state_id] == :not_created
               b2.use Message, I18n.t('vagrant_openstack.not_created')
             else
-              b2.use Provision
+              b2.use ProvisionWrapper
               b2.use SyncFolders
             end
           end
@@ -99,7 +99,7 @@ module VagrantPlugins
             case env[:machine_state_id]
             when :not_created
               ssh_disabled = env[:machine].provider_config.ssh_disabled
-              b2.use Provision unless ssh_disabled
+              b2.use ProvisionWrapper unless ssh_disabled
               b2.use SyncFolders
               b2.use CreateStack
               b2.use CreateServer
@@ -212,6 +212,7 @@ module VagrantPlugins
       autoload :SyncFolders, action_root.join('sync_folders')
       autoload :Suspend, action_root.join('suspend')
       autoload :Resume, action_root.join('resume')
+      autoload :ProvisionWrapper, action_root.join('provision')
       autoload :WaitForServerToStop, action_root.join('wait_stop')
       autoload :WaitForServerToBeActive, action_root.join('wait_active')
       autoload :WaitForServerToBeAccessible, action_root.join('wait_accessible')

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

@@ -0,0 +1,60 @@
+require 'log4r'
+
+require 'vagrant/action/builder'
+
+require 'vagrant-openstack-provider/action/abstract_action'
+require 'vagrant-openstack-provider/action/read_ssh_info'
+
+module VagrantPlugins
+  module Openstack
+    module Action
+      include Vagrant::Action::Builtin
+
+      class ProvisionWrapper < AbstractAction
+        def initialize(app, env)
+          @app    = app
+          @env    = env
+          @logger = Log4r::Logger.new('vagrant_openstack::action::provision_wrapper')
+        end
+
+        def execute(env)
+          @logger.info 'Run provisioning'
+          InternalProvisionWrapper.new(@app, @env).call(@env)
+          @app.call(env)
+        end
+      end
+
+      class InternalProvisionWrapper < Vagrant::Action::Builtin::Provision
+        def initialize(app, env)
+          @logger = Log4r::Logger.new('vagrant_openstack::action::internal_provision_wrapper')
+          super app, env
+        end
+
+        def run_provisioner(env)
+          if env[:provisioner].class == VagrantPlugins::Shell::Provisioner
+            handle_shell_meta_args(env)
+          end
+          env[:provisioner].provision
+        end
+
+        private
+
+        def handle_shell_meta_args(env)
+          config = env[:provisioner].config
+          args = config.args.nil? ? [] : [config.args].flatten
+          config.args = []
+          @logger.info "Shell provisioner args: #{args}"
+          args.each do |arg|
+            if '@@ssh_ip@@'.eql? arg
+              ssh_info = VagrantPlugins::Openstack::Action.get_ssh_info(env)
+              @logger.info "Replace meta-arg #{arg} by value #{ssh_info[:host]}"
+              config.args << ssh_info[:host]
+            else
+              config.args << arg
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -63,6 +63,10 @@ module VagrantPlugins
           @ssh_info = {}
         end
       end
+
+      def self.get_ssh_info(env)
+        SSHInfoHolder.instance.ssh_info[env[:machine].id.to_sym]
+      end
     end
   end
 end

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

@@ -106,7 +106,7 @@ module VagrantPlugins
         #
         attr_accessor :device
 
-        # rubocop:disable Style/ParameterLists
+        # rubocop:disable Metrics/ParameterLists
         def initialize(id, name, size, status, bootable, instance_id, device)
           @size = size
           @status = status
@@ -115,7 +115,7 @@ module VagrantPlugins
           @device = device
           super(id, name)
         end
-        # rubocop:enable Style/ParameterLists
+        # rubocop:enable Metrics/ParameterLists
 
         def to_s
           {

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

@@ -32,15 +32,18 @@ module VagrantPlugins
               }
           }
 
-        log_request(:POST, config.openstack_auth_url, post_body.to_json)
+        auth_url = get_auth_url_v2 env
+
+        headers = {
+          content_type: :json,
+          accept: :json
+        }
+
+        log_request(:POST, auth_url, post_body.to_json, headers)
 
         post_body[:auth][:passwordCredentials][:password] = config.password
 
-        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|
+        authentication = RestUtils.post(env, auth_url, post_body.to_json, headers) do |response|
           log_response(response)
           case response.code
           when 200
@@ -61,6 +64,14 @@ module VagrantPlugins
 
         access['serviceCatalog']
       end
+
+      private
+
+      def get_auth_url_v2(env)
+        url = env[:machine].provider_config.openstack_auth_url
+        return url if url.match(%r{/tokens/*$})
+        "#{url}/tokens"
+      end
     end
   end
 end

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

@@ -51,7 +51,16 @@ module VagrantPlugins
         server = {}.tap do |s|
           s['name'] = options[:name]
           if options[:image_ref].nil?
-            s['block_device_mapping'] = [{ volume_id: options[:volume_boot][:id], device_name: options[:volume_boot][:device] }]
+            s['block_device_mapping'] = [{ volume_id: options[:volume_boot][:id],
+                                           device_name: options[:volume_boot][:device] }] if options[:volume_boot].key?(:id)
+            s['block_device_mapping_v2'] = [{ boot_index: '0',
+                                              volume_size: options[:volume_boot][:size],
+                                              uuid: options[:volume_boot][:image],
+                                              device_name: options[:volume_boot][:device],
+                                              source_type: 'image',
+                                              destination_type: 'volume',
+                                              delete_on_termination: options[:volume_boot][:delete_on_destroy] }]\
+                                              if options[:volume_boot].key?(:image)
           else
             s['imageRef'] = options[:image_ref]
           end
@@ -64,7 +73,7 @@ module VagrantPlugins
           s['networks'] = options[:networks] unless options[:networks].nil? || options[:networks].empty?
         end
         object = { server: server }
-        object[:scheduler_hints] = options[:scheduler_hints] unless options[:scheduler_hints].nil?
+        object['os:scheduler_hints'] = options[:scheduler_hints] unless options[:scheduler_hints].nil?
         server = post(env, "#{@session.endpoints[:compute]}/servers", object.to_json)
         JSON.parse(server)['server']['id']
       end
@@ -137,7 +146,9 @@ module VagrantPlugins
       def delete_keypair_if_vagrant(env, server_id)
         instance_exists do
           keyname = get_server_details(env, server_id)['key_name']
-          delete(env, "#{@session.endpoints[:compute]}/os-keypairs/#{keyname}") if keyname.start_with?('vagrant-generated-')
+          if keyname
+            delete(env, "#{@session.endpoints[:compute]}/os-keypairs/#{keyname}") if keyname.start_with?('vagrant-generated-')
+          end
         end
       end
 

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

@@ -1,4 +1,5 @@
 require 'vagrant-openstack-provider/client/openstack'
+require 'colorize'
 
 module VagrantPlugins
   module Openstack

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

@@ -2,7 +2,7 @@ module VagrantPlugins
   module Openstack
     module Command
       COMMANDS = [
-        { name: :'image-list', file: 'image_list' , clazz: 'ImageList' },
+        { name: :'image-list', file: 'image_list', clazz: 'ImageList' },
         { name: :'flavor-list', file: 'flavor_list', clazz: 'FlavorList' },
         { name: :'network-list', file: 'network_list', clazz: 'NetworkList' },
         { name: :'subnet-list', file: 'subnet_list', clazz: 'SubnetList' },
@@ -13,7 +13,6 @@ module VagrantPlugins
 
       class Main < Vagrant.plugin('2', :command)
         def self.synopsis
-          Openstack.init_i18n
           I18n.t('vagrant_openstack.command.main_synopsis')
         end
 
@@ -33,7 +32,6 @@ module VagrantPlugins
         end
 
         def execute
-          Openstack.init_i18n
           command_class = @commands.get(@sub_command.to_sym) if @sub_command
           return usage unless command_class && @sub_command
           command_class.new(@sub_args, @env).execute(@sub_command)

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

@@ -258,7 +258,7 @@ module VagrantPlugins
             # Don't set the value if it is the unset value, either.
             value = obj.instance_variable_get(key)
 
-            if [:@networks, :@volumes, :@rsync_includes, :@ignore_files, :@floating_ip_pool, :@stacks].include? key
+            if [:@networks, :@volumes, :@rsync_includes, :@rsync_ignore_files, :@floating_ip_pool, :@stacks].include? key
               result.instance_variable_set(key, value) unless value.empty?
             elsif [:@http].include? key
               result.instance_variable_set(key, instance_variable_get(key).merge(other.instance_variable_get(key))) if value != UNSET_VALUE
@@ -276,7 +276,7 @@ module VagrantPlugins
         result
       end
 
-      # rubocop:disable Style/CyclomaticComplexity
+      # rubocop:disable Metrics/CyclomaticComplexity
       def finalize!
         @password = nil if @password == UNSET_VALUE
         @openstack_compute_url = nil if @openstack_compute_url == UNSET_VALUE
@@ -323,7 +323,7 @@ module VagrantPlugins
         @stacks = nil if @stacks.empty?
         @http.finalize!
       end
-      # rubocop:enable Style/CyclomaticComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       def rsync_include(inc)
         @rsync_includes << inc

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

@@ -25,15 +25,12 @@ module VagrantPlugins
 
       def resolve_image(env)
         @logger.info 'Resolving image'
-        config = env[:machine].provider_config
-        return nil if config.image.nil?
-        nova = env[:openstack_client].nova
-        env[:ui].info(I18n.t('vagrant_openstack.finding_image'))
-        images = nova.get_all_images(env)
-        @logger.info "Finding image matching name '#{config.image}'"
-        image = find_matching(images, config.image)
-        fail Errors::NoMatchingImage unless image
-        image
+        resolve_image_internal(env, env[:machine].provider_config.image)
+      end
+
+      def resolve_volume_boot_image(env)
+        @logger.info 'Resolving image to create a volume from'
+        resolve_image_internal(env, env[:machine].provider_config.volume_boot[:image])
       end
 
       def resolve_floating_ip(env)
@@ -65,7 +62,7 @@ module VagrantPlugins
         return resolve_networks_without_network_service(env) unless env[:openstack_client].session.endpoints.key? :network
 
         all_networks = env[:openstack_client].neutron.get_all_networks(env)
-        all_network_ids = all_networks.map { |v| v.id }
+        all_network_ids = all_networks.map(&:id)
 
         networks = []
         config.networks.each do |network|
@@ -76,20 +73,28 @@ module VagrantPlugins
       end
 
       def resolve_volume_boot(env)
-        @logger.info 'Resolving image'
         config = env[:machine].provider_config
         return nil if config.volume_boot.nil?
         return resolve_volume_without_volume_service(env, config.volume_boot, 'vda') unless env[:openstack_client].session.endpoints.key? :volume
 
         volume_list = env[:openstack_client].cinder.get_all_volumes(env)
-        volume_ids = volume_list.map { |v| v.id }
+        volume_ids = volume_list.map(&:id)
 
         @logger.debug(volume_list)
 
         volume = resolve_volume(config.volume_boot, volume_list, volume_ids)
-        device = volume[:device].nil? ? 'vda' : volume[:device]
 
-        { id: volume[:id], device: device }
+        device = (volume[:device].nil?) ? 'vda' : volume[:device]
+        size = (volume[:size].nil?) ? nil : volume[:size]
+        delete_on_destroy = (volume[:delete_on_destroy].nil?) ? nil : volume[:delete_on_destroy]
+
+        image = resolve_volume_boot_image(env) unless volume[:image].nil?
+        image_id = (image.nil?) ? nil : image.id
+        if image.nil?
+          return { id: volume[:id], device: device }
+        else
+          { image: image_id, device: device, size: size, delete_on_destroy: delete_on_destroy }
+        end
       end
 
       def resolve_volumes(env)
@@ -100,7 +105,7 @@ module VagrantPlugins
         return resolve_volumes_without_volume_service(env) unless env[:openstack_client].session.endpoints.key? :volume
 
         volume_list = env[:openstack_client].cinder.get_all_volumes(env)
-        volume_ids = volume_list.map { |v| v.id }
+        volume_ids = volume_list.map(&:id)
 
         @logger.debug(volume_list)
 
@@ -135,6 +140,17 @@ module VagrantPlugins
 
       private
 
+      def resolve_image_internal(env, image_name)
+        return nil if image_name.nil?
+
+        nova = env[:openstack_client].nova
+        env[:ui].info(I18n.t('vagrant_openstack.finding_image'))
+        images = nova.get_all_images(env)
+        image = find_matching(images, image_name)
+        fail Errors::NoMatchingImage unless image
+        image
+      end
+
       def search_free_ip(config, nova, env)
         @logger.debug 'Retrieving all allocated floating ips on tenant'
         all_floating_ips = nova.get_all_floating_ips(env)
@@ -258,23 +274,37 @@ module VagrantPlugins
       def resolve_volume_from_hash(volume, volume_list, volume_ids)
         device = nil
         device = volume[:device] if volume.key?(:device)
+        delete_on_destroy = (volume[:delete_on_destroy].nil?) ? 'true' : volume[:delete_on_destroy]
+
+        volume_id = nil
         if volume.key?(:id)
           fail Errors::ConflictVolumeNameId, volume: volume if volume.key?(:name)
+          check_boot_volume_conflict(volume)
           volume_id = volume[:id]
           fail Errors::UnresolvedVolumeId, id: volume_id unless volume_ids.include? volume_id
         elsif volume.key?(:name)
           volume_list.each do |v|
             next unless v.name.eql? volume[:name]
             fail Errors::MultipleVolumeName, name: volume[:name] unless volume_id.nil?
+            check_boot_volume_conflict(volume)
             volume_id = v.id
           end
           fail Errors::UnresolvedVolumeName, name: volume[:name] unless volume_ids.include? volume_id
+        elsif volume.key?(:image)
+          fail Errors::UnresolvedVolume, volume: volume unless volume.key?(:size)
+          fail Errors::ConflictBootVolume, volume: volume if volume.key?(:id)
+          fail Errors::ConflictBootVolume, volume: volume if volume.key?(:name)
+          return { image: volume[:image], device: device, size: volume[:size], delete_on_destroy: delete_on_destroy }
         else
-          fail Errors::ConflictVolumeNameId, volume: volume
+          fail Errors::ConflictBootVolume, volume: volume
         end
         { id: volume_id, device: device }
       end
 
+      def check_boot_volume_conflict(volume)
+        fail Errors::ConflictBootVolume, volume: volume if volume.key?(:image) || volume.key?(:size) || volume.key?(:delete_on_destroy)
+      end
+
       # This method finds any matching _thing_ from a list of names
       # in a collection of _things_. The first to match is the returned
       # one. Names in list can be a regexp, a partial match is chosen