vagrant-openstack-provider 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6700023eabc299f30f0c0403dac3955bd22c8d78
-  data.tar.gz: 5158ae5cdaeb3c306fed463f43a5adf33cff0190
+  metadata.gz: d9e64c02d3bf2d8b9e0bcc903a02546cc51e7bce
+  data.tar.gz: 8e5200339ede584e5cfbf980b49b98a41146e275
 SHA512:
-  metadata.gz: f7c0405fd3d9aecd3c2ad876018ce5bec702ad61f6cea4799a12e7288cbebd2e143a2731959c260e0f61afa0ef1fc8e3333131884b649bdb6c1cf0f18fa3211a
-  data.tar.gz: 1e12503398d53f5ac8a4b59e47267f8a8ca64f6f5ec4de5df291cc210a4307af0c34c557ffbdc72ea59e2ae15aecfc591ff9b71d23b313c4c711a1fc2280a782
+  metadata.gz: 3f56b3c7bde75c3813dee4bc83de5e9d9e367e71fc4f7d61fa0a486dce0f5130d559e8b26d55e30cd44babec3dd5c0544f0f20ca60327bf812f4448a40e5931a
+  data.tar.gz: 95711dba6f3275a1a54dd375424d5a536225d60c1c21ddb3c2514c59a23dde977e75db68a216c0a11f38a87ee69a682c8d5411e89ce9bf000233e4f521bde843

data/.rubocop.yml

@@ -16,10 +16,10 @@ Style/ClassLength:
 
 Style/CyclomaticComplexity:
   Severity: warning
-  Max: 10
+  Max: 15
 
 Style/MethodLength:
-  Max: 50
+  Max: 60
 
 Style/LineLength:
   Max: 150

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+# 0.5.0 (November 4, 2014)
+
+FEATURES:
+
+  - Add an option to disable SSH Authentication and allow private vms [#120](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/120)
+  - Support for fixed IP address for private network [#87](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/87)
+
+IMPROVEMENTS:
+
+  - Accept a string for ssh_timeout value [#144](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/144)
+  - Vagrant Openstack should works in degraded mode id only Keystone and Nova are availables [#142](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/142)
+  - Add custom command `vagrant openstack reset [#107](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/107)
+  - Make box optional [#105](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/105)
+  - vagrant up => Instance could not be found [#98](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/98)
+
+BUG FIXES:
+
+  - security_groups should be an array of hashes [#137](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/137)
+  - user_data needs to be Base64 encoded in Nova.createServer [#122](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/122)
+  - SSH failures after port 22 is open because user doesn't exist yet [#106](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/106)
+  - Floating IP should not be mandatory [#55](https://github.com/ggiamarchi/vagrant-openstack-provider/issues/55)
+
 # 0.4.1 (October 3, 2014)
 
 BUG FIXES:

data/Gemfile

@@ -2,24 +2,17 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'json', '1.7.7'
-gem 'appraisal', '1.0.0'
-gem 'rest-client', '~> 1.6.0'
-gem 'terminal-table', '1.4.5'
-gem 'webmock', '~> 1.18.0', group: [:test]
-gem 'rubocop', '0.23.0', require: false
-gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.4.3'
-gem 'fakefs', '~> 0.5.2', group: [:test]
-gem 'sshkey', '~> 1.6.1'
-gem 'colorize', '~> 0.7.3'
-
 group :development do
-  # We depend on Vagrant for development, but we don't add it as a
-  # gem dependency because we expect to be installed within the
-  # Vagrant environment itself using `vagrant plugin`.
+  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 'coveralls', require: false
 end
 
 group :debug do
-  gem 'debugger'
+  gem 'byebug'
+end
+
+group :plugins do
+  gem "vagrant-openstack-provider", path: "."
 end

data/Vagrantfile

@@ -2,17 +2,19 @@ require 'vagrant-openstack-provider'
 
 Vagrant.configure('2') do |config|
 
-  config.vm.box = 'dummy-openstack'
-  config.vm.box_url = 'https://github.com/ggiamarchi/vagrant-openstack/raw/master/source/dummy.box'
-  config.ssh.username = 'stack'
+  config.vm.box = 'openstack'
+
+  config.ssh.username = ENV['OS_SSH_USERNAME']
 
   config.vm.provider :openstack do |os|
-    os.username = ENV['OS_USERNAME']
-    os.floating_ip_pool = ENV['OS_FLOATING_IP_POOL']
-    os.password = ENV['OS_PASSWORD']
-    os.flavor = ENV['OS_FLAVOR']
-    os.image = ENV['OS_IMAGE']
-    os.openstack_auth_url = ENV['OS_AUTH_URL']
-    os.tenant_name = ENV['OS_TENANT_NAME']
+    os.openstack_auth_url    = ENV['OS_AUTH_URL']
+    os.tenant_name           = ENV['OS_TENANT_NAME']
+    os.username              = ENV['OS_USERNAME']
+    os.password              = ENV['OS_PASSWORD']
+    os.floating_ip_pool      = ENV['OS_FLOATING_IP_POOL']
+    os.flavor                = ENV['OS_FLAVOR']
+    os.image                 = ENV['OS_IMAGE']
   end
+
+  config.vm.provision "shell", inline: "echo 'ok' > ~/provision"
 end

data/gemfiles/latest_stable.gemfile

@@ -1,20 +1,10 @@
-# This file was generated by Appraisal
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
-
-gem "appraisal", "1.0.0"
-gem "restclient", "0.10.0"
-gem "terminal-table", "1.4.5"
-gem "webmock", "~> 1.18.0", :group => [:test]
-gem "rubocop", "0.23.0", :require => false
-gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
-gem "fakefs", "~> 0.5.2", :group => [:test]
-gem "sshkey", "~> 1.6.1"
-gem "colorize", "~> 0.7.3"
+gemspec :path => "../"
 
 group :development do
-  gem "coveralls", :require => false
-  gem "debugger"
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.5'
+  gem 'appraisal', '1.0.0'
+  gem 'rubocop', '0.23.0', require: false
+  gem 'coveralls', require: false
 end
-
-gemspec :path => "../"

data/gemfiles/minimal_release.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec :path => "../"
+
+group :development do
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.4.0'
+  gem 'appraisal', '1.0.0'
+  gem 'rubocop', '0.23.0', require: false
+  gem 'coveralls', require: false
+end

data/gemfiles/previous_release.gemfile

@@ -1,20 +1,10 @@
-# This file was generated by Appraisal
+source 'https://rubygems.org'
 
-source "https://rubygems.org"
-
-gem "appraisal", "1.0.0"
-gem "restclient", "0.10.0"
-gem "terminal-table", "1.4.5"
-gem "webmock", "~> 1.18.0", :group => [:test]
-gem "rubocop", "0.23.0", :require => false
-gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
-gem "fakefs", "~> 0.5.2", :group => [:test]
-gem "sshkey", "~> 1.6.1"
-gem "colorize", "~> 0.7.3"
+gemspec :path => "../"
 
 group :development do
-  gem "coveralls", :require => false
-  gem "debugger"
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.5.4'
+  gem 'appraisal', '1.0.0'
+  gem 'rubocop', '0.23.0', require: false
+  gem 'coveralls', require: false
 end
-
-gemspec :path => "../"

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

@@ -67,7 +67,8 @@ module VagrantPlugins
           config = env[:machine].provider_config
           client.session.endpoints[:compute] = config.openstack_compute_url unless config.openstack_compute_url.nil?
           client.session.endpoints[:network] = config.openstack_network_url unless config.openstack_network_url.nil?
-          client.session.endpoints[:volume] = config.openstack_volume_url unless config.openstack_volume_url.nil?
+          client.session.endpoints[:volume]  = config.openstack_volume_url  unless config.openstack_volume_url.nil?
+          client.session.endpoints.delete_if { |_, value| value.nil? || value.empty? }
         end
 
         def log_endpoint_catalog(env)

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

@@ -3,6 +3,8 @@ require 'socket'
 require 'timeout'
 require 'sshkey'
 
+require 'vagrant-openstack-provider/config_resolver'
+require 'vagrant-openstack-provider/utils'
 require 'vagrant/util/retryable'
 
 module VagrantPlugins
@@ -11,9 +13,11 @@ module VagrantPlugins
       class CreateServer
         include Vagrant::Util::Retryable
 
-        def initialize(app, _env)
+        def initialize(app, _env, resolver = ConfigResolver.new, utils = Utils.new)
           @app = app
           @logger = Log4r::Logger.new('vagrant_openstack::action::create_server')
+          @resolver = resolver
+          @utils = utils
         end
 
         def call(env)
@@ -24,18 +28,16 @@ module VagrantPlugins
           fail Errors::MissingBootOption if config.image.nil? && config.volume_boot.nil?
           fail Errors::ConflictBootOption unless config.image.nil? || config.volume_boot.nil?
 
-          nova = env[:openstack_client].nova
-
           options = {
-            flavor: resolve_flavor(env),
-            image: resolve_image(env),
-            volume_boot: resolve_volume_boot(env),
-            networks: resolve_networks(env),
-            volumes: resolve_volumes(env),
-            keypair_name: resolve_keypair(env),
+            flavor: @resolver.resolve_flavor(env),
+            image: @resolver.resolve_image(env),
+            volume_boot: @resolver.resolve_volume_boot(env),
+            networks: @resolver.resolve_networks(env),
+            volumes: @resolver.resolve_volumes(env),
+            keypair_name: @resolver.resolve_keypair(env),
             availability_zone: env[:machine].provider_config.availability_zone,
             scheduler_hints: env[:machine].provider_config.scheduler_hints,
-            security_groups: env[:machine].provider_config.security_groups,
+            security_groups: @resolver.resolve_security_groups(env),
             user_data: env[:machine].provider_config.user_data,
             metadata: env[:machine].provider_config.metadata
           }
@@ -45,205 +47,15 @@ module VagrantPlugins
           # Store the ID right away so we can track it
           env[:machine].id = server_id
 
-          waiting_for_server_to_be_build(env, server_id)
-
-          floating_ip = resolve_floating_ip(env)
-          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))
-            nova.add_floating_ip(env, server_id, floating_ip)
-          end
-
+          waiting_for_server_to_be_built(env, server_id)
+          assign_floating_ip(env, server_id)
           attach_volumes(env, server_id, options[:volumes]) unless options[:volumes].empty?
 
-          unless env[:interrupted]
-            # Clear the line one more time so the progress is removed
-            env[:ui].clear_line
-
-            # Wait for SSH to become available
-            ssh_timeout = env[:machine].provider_config.ssh_timeout
-            unless port_open?(env, floating_ip, resolve_ssh_port(env), ssh_timeout)
-              env[:ui].error(I18n.t('vagrant_openstack.timeout'))
-              fail Errors::SshUnavailable, host: floating_ip, timeout: ssh_timeout
-            end
-
-            @logger.info 'The server is ready'
-            env[:ui].info(I18n.t('vagrant_openstack.ready'))
-          end
-
           @app.call(env)
         end
 
         private
 
-        def resolve_ssh_port(env)
-          machine_config = env[:machine].config
-          return machine_config.ssh.port if machine_config.ssh.port
-          22
-        end
-
-        # 1. if floating_ip is set, use it
-        # 2. if floating_ip_pool is set
-        #    GET v2/{{tenant_id}}/os-floating-ips
-        #    If any IP with the same pool is available, use it
-        #    Else Allocate a new IP from the pool
-        #       Manage error case
-        # 3. GET v2/{{tenant_id}}/os-floating-ips
-        #    If any IP is available, use it
-        #    Else fail
-        def resolve_floating_ip(env)
-          config = env[:machine].provider_config
-          nova = env[:openstack_client].nova
-          return config.floating_ip if config.floating_ip
-          floating_ips = nova.get_all_floating_ips(env)
-          if config.floating_ip_pool
-            floating_ips.each do |single|
-              return single.ip if single.pool == config.floating_ip_pool && single.instance_id.nil?
-            end unless config.floating_ip_pool_always_allocate
-            return nova.allocate_floating_ip(env, config.floating_ip_pool).ip
-          else
-            floating_ips.each do |ip|
-              return ip.ip if ip.instance_id.nil?
-            end
-          end
-          fail Errors::UnableToResolveFloatingIP
-        end
-
-        def resolve_keypair(env)
-          config = env[:machine].provider_config
-          nova = env[:openstack_client].nova
-          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)
-        end
-
-        def generate_keypair(env)
-          key = SSHKey.generate
-          nova = env[:openstack_client].nova
-          generated_keyname = nova.import_keypair(env, key.ssh_public_key)
-          File.write("#{env[:machine].data_dir}/#{generated_keyname}", key.private_key)
-          generated_keyname
-        end
-
-        def resolve_flavor(env)
-          @logger.info 'Resolving flavor'
-          config = env[:machine].provider_config
-          nova = env[:openstack_client].nova
-          env[:ui].info(I18n.t('vagrant_openstack.finding_flavor'))
-          flavors = nova.get_all_flavors(env)
-          @logger.info "Finding flavor matching name '#{config.flavor}'"
-          flavor = find_matching(flavors, config.flavor)
-          fail Errors::NoMatchingFlavor unless flavor
-          flavor
-        end
-
-        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
-        end
-
-        def resolve_networks(env)
-          @logger.info 'Resolving network(s)'
-          config = env[:machine].provider_config
-          return [] if config.networks.nil? || config.networks.empty?
-          env[:ui].info(I18n.t('vagrant_openstack.finding_networks'))
-
-          private_networks = env[:openstack_client].neutron.get_private_networks(env)
-          private_network_ids = private_networks.map { |n| n.id }
-
-          networks = []
-          config.networks.each do |network|
-            if private_network_ids.include?(network)
-              networks << network
-              next
-            end
-            net_id = nil
-            private_networks.each do |n| # Bad algorithm complexity, but here we don't care...
-              next unless n.name.eql? network
-              fail "Multiple networks with name '#{n.id}'" unless net_id.nil?
-              net_id = n.id
-            end
-            fail "No matching network with name '#{network}'" if net_id.nil?
-            networks << net_id
-          end
-          networks
-        end
-
-        def resolve_volume_boot(env)
-          @logger.info 'Resolving image'
-          config = env[:machine].provider_config
-          return nil if config.volume_boot.nil?
-
-          volume_list = env[:openstack_client].cinder.get_all_volumes(env)
-          volume_ids = volume_list.map { |v| v.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 }
-        end
-
-        def resolve_volumes(env)
-          @logger.info 'Resolving volume(s)'
-          config = env[:machine].provider_config
-          return [] if config.volumes.nil? || config.volumes.empty?
-          env[:ui].info(I18n.t('vagrant_openstack.finding_volumes'))
-
-          volume_list = env[:openstack_client].cinder.get_all_volumes(env)
-          volume_ids = volume_list.map { |v| v.id }
-
-          @logger.debug(volume_list)
-
-          volumes = []
-          config.volumes.each do |volume|
-            volumes << resolve_volume(volume, volume_list, volume_ids)
-          end
-          @logger.debug("Resolved volumes : #{volumes.to_json}")
-          volumes
-        end
-
-        def resolve_volume(volume, volume_list, volume_ids)
-          return resolve_volume_from_string(volume, volume_list) if volume.is_a? String
-          return resolve_volume_from_hash(volume, volume_list, volume_ids) if volume.is_a? Hash
-          fail Errors::InvalidVolumeObject, volume: volume
-        end
-
-        def resolve_volume_from_string(volume, volume_list)
-          found_volume = find_matching(volume_list, volume)
-          fail Errors::UnresolvedVolume, volume: volume if found_volume.nil?
-          { id: found_volume.id, device: nil }
-        end
-
-        def resolve_volume_from_hash(volume, volume_list, volume_ids)
-          device = nil
-          device = volume[:device] if volume.key?(:device)
-          if volume.key?(:id)
-            fail Errors::ConflictVolumeNameId, volume: volume if volume.key?(:name)
-            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?
-              volume_id = v.id
-            end
-            fail Errors::UnresolvedVolumeName, name: volume[:name] unless volume_ids.include? volume_id
-          else
-            fail Errors::ConflictVolumeNameId, volume: volume
-          end
-          { id: volume_id, device: device }
-        end
-
         def create_server(env, options)
           config = env[:machine].provider_config
           nova = env[:openstack_client].nova
@@ -262,11 +74,20 @@ module VagrantPlugins
           env[:ui].info(" -- KeyPair         : #{options[:keypair_name]}")
 
           unless options[:networks].empty?
+            formated_networks = ' -- '
             if options[:networks].size == 1
-              env[:ui].info(" -- Network         : #{options[:networks][0]}")
+              formated_networks << 'Network         : '
             else
-              env[:ui].info(" -- Networks        : #{options[:networks]}")
+              formated_networks << 'Networks        : '
             end
+            formated_networks << options[:networks].map do |n|
+              if n.key? :fixed_ip
+                "#{n[:uuid]} (#{n[:fixed_ip]})"
+              else
+                n[:uuid]
+              end
+            end.join(', ')
+            env[:ui].info(formated_networks)
           end
 
           unless options[:volumes].empty?
@@ -305,62 +126,33 @@ module VagrantPlugins
           nova.create_server(env, create_opts)
         end
 
-        def waiting_for_server_to_be_build(env, server_id)
+        def waiting_for_server_to_be_built(env, server_id, retry_interval = 3, timeout = 200)
           @logger.info 'Waiting for the server to be built...'
           env[:ui].info(I18n.t('vagrant_openstack.waiting_for_build'))
-          nova = env[:openstack_client].nova
-          timeout(200) do
-            while nova.get_server_details(env, server_id)['status'] != 'ACTIVE'
-              sleep 3
+          timeout(timeout) do
+            while env[:openstack_client].nova.get_server_details(env, server_id)['status'] != 'ACTIVE'
+              sleep retry_interval
               @logger.debug('Waiting for server to be ACTIVE')
             end
           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 attach_volumes(env, server_id, volumes)
           @logger.info("Attaching volumes #{volumes} to server #{server_id}")
-          nova = env[:openstack_client].nova
           volumes.each do |volume|
             @logger.debug("Attaching volumes #{volume}")
-            nova.attach_volume(env, server_id, volume[:id], volume[:device])
-          end
-        end
-
-        def port_open?(env, ip, port, timeout)
-          start_time = Time.now
-          current_time = start_time
-          nb_retry = 0
-          while (current_time - start_time) <= timeout
-            begin
-              @logger.debug "Checking if SSH port is open... Attempt number #{nb_retry}"
-              if nb_retry % 5 == 0
-                @logger.info 'Waiting for SSH to become available...'
-                env[:ui].info(I18n.t('vagrant_openstack.waiting_for_ssh'))
-              end
-              TCPSocket.new(ip, port)
-              return true
-            rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ETIMEDOUT
-              @logger.debug 'SSH port is not open... new retry in in 1 second'
-              nb_retry += 1
-              sleep 1
-            end
-            current_time = Time.now
-          end
-          false
-        end
-
-        # This method finds a matching _thing_ in a collection of
-        # _things_. This works matching if the ID or NAME equals to
-        # `name`. Or, if `name` is a regexp, a partial match is chosen
-        # as well.
-        def find_matching(collection, name)
-          collection.each do |single|
-            return single if single.id == name
-            return single if single.name == name
-            return single if name.is_a?(Regexp) && name =~ single.name
+            env[:openstack_client].nova.attach_volume(env, server_id, volume[:id], volume[:device])
           end
-          @logger.error "Element '#{name}' not found in collection #{collection}"
-          nil
         end
       end
     end