vagrant-openstack-provider 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893e41d08fcadbc4e14a8d24228bf2009d947c84
-  data.tar.gz: 468a1572bc27fcd2d81b5b385a1c906673b66f5c
+  metadata.gz: 1062d3b235767d1459f0fc018c419b688620f69e
+  data.tar.gz: 28314e50ec001ed36d5f00a975239cd9e18268e5
 SHA512:
-  metadata.gz: ae7a94bea4991cc8bed4d0f1020b29d3261b8042c196f26e97f11d62bf58206287ad4632c1856938b0e0078dc1d9ebcf93904024b500aa2227e6d1ce02c2fb10
-  data.tar.gz: 9c47974e708ed6fc514eb18b5c407f87bc015d6d5f869eb10205ec714d10a0f662d6f810c34235aee7ea6f306a0469e05646f7d26a7abe740928fdda130ea058
+  metadata.gz: 977c2d6ab3a78601e6cd0d3ed307d79d7ef2218f0a86870e705c908de2a0e674e6ce4dbc97a63b22a2520ba71b3a9db89941d4c966356413f14457ec8afeae23
+  data.tar.gz: bea47c2f131dc201c8aa0ea133de2a7781a48f795ac510ec539f39638971f595a6783740d48f6dfdc8a78e979055f63743c2ac4c376effd9406e8cca0f491baf

data/CHANGELOG.md

@@ -1,8 +1,11 @@
+# 0.13.0 (July 30, 2018)
+
+See https://github.com/ggiamarchi/vagrant-openstack-provider/milestone/20?closed=1
+
 # 0.12.0 (February 26, 2018)
 
-FEATURES:
+See https://github.com/ggiamarchi/vagrant-openstack-provider/milestone/19?closed=1
 
-  - Support parallel actions (#130)
 
 # 0.11.0 (August 5, 2017)
 

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.9.1'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.9.8'
   # FIXME: Hack to allow Vagrant v1.6.5 to install for tests. Remove when
   # support for 1.6.5 is dropped.
   gem 'rack', '< 2'
@@ -16,7 +16,3 @@ end
 group :debug do
   gem 'byebug'
 end
-
-group :plugins do
-  gem 'vagrant-openstack-provider', path: '.'
-end

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

@@ -96,7 +96,7 @@ module VagrantPlugins
                 user: {
                   name: config.username,
                   domain: {
-                    name: config.domain_name
+                    name: config.user_domain_name
                   },
                   password: '****'
                 }
@@ -105,7 +105,7 @@ module VagrantPlugins
             scope: {
               project: {
                 name: config.project_name,
-                domain: { name: config.domain_name }
+                domain: { name: config.project_domain_name }
               }
             }
           }

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

@@ -3,8 +3,17 @@ require 'restclient'
 module VagrantPlugins
   module Openstack
     module RestUtils
+      def self._set_proxy(config)
+        @logger = Log4r::Logger.new('vagrant_openstack::restutils')
+        if config.http.proxy
+          RestClient.proxy = config.http.proxy
+          @logger.info "Setting up HTTP proxy to '#{config.http.proxy}'"
+        end
+      end
+
       def self.get(env, url, headers = {}, &block)
         config = env[:machine].provider_config
+        _set_proxy(config)
         RestClient::Request.execute(method: :get, url: url, headers: headers,
                                     timeout: config.http.read_timeout, open_timeout: config.http.open_timeout,
                                     ssl_ca_file: config.ssl_ca_file, verify_ssl: config.ssl_verify_peer, &block)
@@ -12,6 +21,7 @@ module VagrantPlugins
 
       def self.post(env, url, payload, headers = {}, &block)
         config = env[:machine].provider_config
+        _set_proxy(config)
         RestClient::Request.execute(method: :post, url: url, payload: payload, headers: headers,
                                     timeout: config.http.read_timeout, open_timeout: config.http.open_timeout,
                                     ssl_ca_file: config.ssl_ca_file, verify_ssl: config.ssl_verify_peer, &block)
@@ -19,6 +29,7 @@ module VagrantPlugins
 
       def self.delete(env, url, headers = {}, &block)
         config = env[:machine].provider_config
+        _set_proxy(config)
         RestClient::Request.execute(method: :delete, url: url, headers: headers,
                                     timeout: config.http.read_timeout, open_timeout: config.http.open_timeout,
                                     ssl_ca_file: config.ssl_ca_file, verify_ssl: config.ssl_verify_peer, &block)

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

@@ -72,6 +72,16 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :domain_name
 
+      # The user domain name to access Openstack, this defaults to Default.
+      #
+      # @return [String]
+      attr_accessor :user_domain_name
+
+      # The project domain name to access Openstack, this defaults to Default.
+      #
+      # @return [String]
+      attr_accessor :project_domain_name
+
       # The name of the keypair to use.
       #
       # @return [String]
@@ -302,6 +312,7 @@ module VagrantPlugins
         @use_legacy_synced_folders = UNSET_VALUE
         @ssl_ca_file = UNSET_VALUE
         @ssl_verify_peer = UNSET_VALUE
+        @domain_name = UNSET_VALUE
       end
 
       def merge(other)
@@ -362,7 +373,9 @@ module VagrantPlugins
         @project_name = nil if @project_name == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
-        @domain_name = 'Default' if @domain_name == UNSET_VALUE
+        # If domain_name is set we use it for user and project
+        @user_domain_name = @domain_name if @domain_name != UNSET_VALUE
+        @project_domain_name = @domain_name 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
@@ -423,7 +436,7 @@ module VagrantPlugins
       def rsync_include(inc)
         @rsync_includes << inc
       end
-
+      # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       def validate(machine)
         errors = _detected_errors
 
@@ -465,7 +478,15 @@ module VagrantPlugins
           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?
+          if @domain_name == UNSET_VALUE || @domain_name.nil? || @domain_name.empty?
+            if (@user_domain_name.nil? || @user_domain_name.empty?) && (@project_domain_name_name.nil? || @project_domain_name.empty?)
+              errors << I18n.t('vagrant_openstack.config.domain_required')
+            elsif @user_domain_name.nil? || @user_domain_name.empty?
+              errors << I18n.t('vagrant_openstack.config.user_domain_required')
+            elsif @project_domain_name.nil? || @project_domain_name.empty?
+              errors << I18n.t('vagrant_openstack.config.project_domain_required')
+            end
+          end
           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

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

@@ -11,14 +11,20 @@ module VagrantPlugins
       # @return [Integer]
       attr_accessor :read_timeout
 
+      #
+      # @return [Integer]
+      attr_accessor :proxy
+
       def initialize
         @open_timeout = UNSET_VALUE
         @read_timeout = UNSET_VALUE
+        @proxy = UNSET_VALUE
       end
 
       def finalize!
         @open_timeout = 60 if @open_timeout == UNSET_VALUE
         @read_timeout = 30 if @read_timeout == UNSET_VALUE
+        @proxy = nil if @proxy == UNSET_VALUE
       end
 
       def merge(other)

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

@@ -13,7 +13,7 @@ module VagrantPlugins
           end
         end
         fail Errors::UnableToResolveIP if addresses.size == 0
-        if addresses.size == 1
+        if addresses.size == 1 || !env[:machine].provider_config.networks
           net_addresses = addresses.first[1]
         else
           first_network = env[:machine].provider_config.networks[0]

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

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

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

@@ -16,21 +16,39 @@ module VagrantPlugins
       #
       attr_accessor :status
 
+      #
+      # boolean attribute to disbale version checker
+      #
+      attr_accessor :check_enabled
+
       def initialize
         @status = nil
+        @check_enabled = true
+
+        check = ENV['VAGRANT_OPENSTACK_VERSION_CKECK']
+        @check_enabled = false if check && check.upcase == 'DISABLED'
       end
 
       #
       # Check the latest version from rubygem and set the status
       #
       def check
+        return :latest unless @check_enabled
         return @status unless @status.nil?
-        latest  = Gem.latest_spec_for('vagrant-openstack-provider').version.version
+
+        begin
+          latest = Gem.latest_spec_for('vagrant-openstack-provider').version.version
+        rescue
+          # If for any reason the version of the latest pulished
+          # version can't be found we don't fail in any way
+          return :latest
+        end
+
         current = VagrantPlugins::Openstack::VERSION
 
         unless current =~ VERSION_PATTERN
           @status = :unstable
-          print I18n.t('vagrant_openstack.version_unstable')
+          print_message I18n.t('vagrant_openstack.version_unstable')
           return
         end
 
@@ -47,19 +65,19 @@ module VagrantPlugins
 
         if i_current > i_latest
           @status = :unstable
-          print I18n.t('vagrant_openstack.version_unstable')
+          print_message I18n.t('vagrant_openstack.version_unstable')
           return
         end
 
         @status = :outdated
-        print I18n.t('vagrant_openstack.version_outdated', latest: latest, current: current)
+        print_message I18n.t('vagrant_openstack.version_outdated', latest: latest, current: current)
       end
 
       private
 
-      def print(message)
-        puts message.yellow
-        puts ''
+      def print_message(message)
+        $stderr.puts message.yellow
+        $stderr.puts ''
       end
     end
 

data/locales/en.yml

@@ -146,13 +146,17 @@ en:
         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
+        A domain is required when using identity API version 3. You need to specify domain_name or (project_domain_name and user_domain_name)
+      user_domain_required: |-
+        A user domain is required when specifying a project domain using identity API version 3.
+      project_domain_required: |-
+        A project domain is required when specifying a user domain 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)
+        identity API verison must be 2 or 3 (if not provided, default is 2)
 
     errors:
       default: |-

data/spec/vagrant-openstack-provider/action/connect_openstack_spec.rb

@@ -305,7 +305,8 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
         end
         env[:openstack_client].stub(:neutron)  { neutron }
         env[:openstack_client].stub(:glance)   { glance }
-        config.stub(:domain_name) { 'dummy' }
+        config.stub(:user_domain_name) { 'dummy' }
+        config.stub(:project_domain_name) { 'dummy' }
         config.stub(:identity_api_version) { '3' }
 
         @action.call(env)

data/spec/vagrant-openstack-provider/client/cinder_spec.rb

@@ -5,6 +5,7 @@ describe VagrantPlugins::Openstack::CinderClient do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
       http.stub(:open_timeout) { 43 }
+      http.stub(:proxy) { nil }
     end
   end
 

data/spec/vagrant-openstack-provider/client/glance_spec.rb

@@ -5,6 +5,7 @@ describe VagrantPlugins::Openstack::GlanceClient do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
       http.stub(:open_timeout) { 43 }
+      http.stub(:proxy) { nil }
     end
   end
 

data/spec/vagrant-openstack-provider/client/heat_spec.rb

@@ -7,6 +7,7 @@ describe VagrantPlugins::Openstack::NovaClient do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
       http.stub(:open_timeout) { 43 }
+      http.stub(:proxy) { nil }
     end
   end
 

data/spec/vagrant-openstack-provider/client/keystone_spec.rb

@@ -5,6 +5,7 @@ describe VagrantPlugins::Openstack::KeystoneClient do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
       http.stub(:open_timeout) { 43 }
+      http.stub(:proxy) { nil }
     end
   end
 
@@ -178,7 +179,8 @@ describe VagrantPlugins::Openstack::KeystoneClient do
     # V3
     context 'with good credentials v3' do
       it 'store token and tenant id' do
-        config.stub(:domain_name) { 'dummy' }
+        config.stub(:user_domain_name) { 'dummy' }
+        config.stub(:project_domain_name) { 'dummy' }
         config.stub(:identity_api_version) { '3' }
         config.stub(:openstack_auth_url) { 'http://keystoneAuthV3' }
 
@@ -200,7 +202,8 @@ describe VagrantPlugins::Openstack::KeystoneClient do
 
     context 'with wrong credentials v3' do
       it 'raise an unauthorized error ' do
-        config.stub(:domain_name) { 'dummy' }
+        config.stub(:user_domain_name) { 'dummy' }
+        config.stub(:project_domain_name) { 'dummy' }
         config.stub(:identity_api_version) { '3' }
         config.stub(:openstack_auth_url) { 'http://keystoneAuthV3' }
 

data/spec/vagrant-openstack-provider/client/neutron_spec.rb

@@ -5,6 +5,7 @@ describe VagrantPlugins::Openstack::NeutronClient do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
       http.stub(:open_timeout) { 43 }
+      http.stub(:proxy) { nil }
     end
   end
 

data/spec/vagrant-openstack-provider/client/nova_spec.rb

@@ -10,6 +10,7 @@ describe VagrantPlugins::Openstack::NovaClient do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
       http.stub(:open_timeout) { 43 }
+      http.stub(:proxy) { nil }
     end
   end
 

data/spec/vagrant-openstack-provider/version_checker_spec.rb

@@ -31,8 +31,8 @@ describe VagrantPlugins::Openstack::VersionChecker do
   def assert_version_is(expected_status, latest, current)
     stub_const('VagrantPlugins::Openstack::VERSION', current)
     version.stub(:version) { latest }
-    @checker.stub(:print)
-    expect(@checker).to receive(:print) unless expected_status == :latest
+    @checker.stub(:print_message)
+    expect(@checker).to receive(:print_message) unless expected_status == :latest
     @checker.check
     expect(@checker.status).to eq(expected_status)
   end

data/vagrant-openstack-provider.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/ggiamarchi/vagrant-openstack-provider'
   gem.license       = 'MIT'
 
-  gem.add_dependency 'json', '>= 1.8.1', '< 3.0'
+  gem.add_dependency 'json', '> 2', '< 3'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,28 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-26 00:00:00.000000000 Z
+date: 2018-07-30 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.1
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement