vagrant-lxc 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b214bb08c296b36a640e465653255ef125947255780e6c1a3f3f37e59cf58240
-  data.tar.gz: 8a0fd49b88445c090e9f75427cf096aeec1bf174fe61d424696550d3f079ff38
+  metadata.gz: e67f848663245bd5d8aa0d61f7aaaa5bc735c46b07731170b4dc393cd9c4a62f
+  data.tar.gz: 4fa675ee6a56203bd97f5836b8c5cc9789206e48a5acf0a95b254a708006782b
 SHA512:
-  metadata.gz: 494cbee88612672f2fd209110c6f269185e82ffae9349354cf49e918aa7af21762f5e6985e712fead8a7713826863ba58ed47480769379786458de4b213d6af9
-  data.tar.gz: 11b3acdb633317d75c50f1526c6dde90b73a5ee8ac602c51f4bc6bc43be31e23aed0e19502a20df4860ad2d905b2c1db1463eab42753d449ebbd2af7d0b4cc8a
+  metadata.gz: df714f95c7c8f2e66cc359edb22f7ec51c5ae94cb0d596487e419a002063f8462d26a9082ece178b22dc149605d9a5767c575fa3ed3cd49bb9755880e44b9f95
+  data.tar.gz: 02d44d503d7b3c37a7c8657ee49ef930233e88df876bdd36afc3f3ba6ec7325a83f88d8c7cc4cd8f7ef428aba141dbfc3b53142d389942199b0207c62f688558

data/CHANGELOG.md

@@ -1,8 +1,21 @@
+## [1.4.3](https://github.com/fgrehm/vagrant-lxc/compare/v1.4.2...v1.4.3) (Sep 27, 2018)
+
+FEATURES:
+  - Add config for container ssh IP. [[GH-469]]
+
+FIXES:
+  - Fix problems with `redir` command line (bis). [[GH-473]]
+
+[GH-469]: https://github.com/fgrehm/vagrant-lxc/issues/469
+[GH-473]: https://github.com/fgrehm/vagrant-lxc/issues/473
+
 ## [1.4.2](https://github.com/fgrehm/vagrant-lxc/compare/v1.4.1...v1.4.2) (Jul 17, 2018)
 
 FIXES:
   - Fix problems with `redir` 3.x command line. [[GH-467]]
 
+[GH-467]: https://github.com/fgrehm/vagrant-lxc/issues/467
+
 ## [1.4.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.4.0...v1.4.1) (Apr 30, 2018)
 
 FEATURES:

data/Gemfile

@@ -1,18 +1,18 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.7'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'
 end
 
 group :development, :test do
-  gem 'rake', '~> 10.4.2'
-  gem 'rspec', '~> 2.99.0'
+  gem 'rake'
+  gem 'rspec'
   gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true')
   # The is the ref *just* before we switch to childprocess 0.6, which conflicts with vagrant 1.8 deps.
-  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', ref: '5006bc73cd8796465ca09307d4774f8ec8375aa0'
+  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
 end
 
 group :plugins do

data/lib/vagrant-lxc/action/fetch_ip_with_lxc_info.rb

@@ -21,6 +21,7 @@ module Vagrant
           fetch_ip_tries = config.fetch_ip_tries
           driver = env[:machine].provider.driver
           ip = ''
+          return config.ssh_ip_addr if not config.ssh_ip_addr.nil?
           retryable(:on => LXC::Errors::ExecuteError, :tries => fetch_ip_tries, :sleep => 3) do
             unless ip = get_container_ip_from_ip_addr(driver)
               # retry

data/lib/vagrant-lxc/action/forward_ports.rb

@@ -108,7 +108,7 @@ module Vagrant
         def redir_version
           stdout, stderr, _ = Open3.capture3 "redir --version"
           # For some weird reason redir printed version information in STDERR prior to 3.2
-          version = stdout || stderr
+          version = stdout.empty? ? stderr : stdout
           version.split('.')[0].to_i
         end
 

data/lib/vagrant-lxc/config.rb

@@ -24,6 +24,8 @@ module Vagrant
 
       attr_accessor :fetch_ip_tries
 
+      attr_accessor :ssh_ip_addr
+
       # Whether the container needs to be privileged. Defaults to true (unprivileged containers
       # is a very new feature in vagrant-lxc). If false, will try creating an unprivileged
       # container. If it can't, will revert to the old "sudo wrapper" method to create a privileged
@@ -37,6 +39,7 @@ module Vagrant
         @container_name = UNSET_VALUE
         @tmpfs_mount_size = UNSET_VALUE
         @fetch_ip_tries = UNSET_VALUE
+        @ssh_ip_addr = UNSET_VALUE
         @privileged = UNSET_VALUE
       end
 
@@ -66,6 +69,7 @@ module Vagrant
         @existing_container_name = nil if @existing_container_name == UNSET_VALUE
         @tmpfs_mount_size = '2G' if @tmpfs_mount_size == UNSET_VALUE
         @fetch_ip_tries = 10 if @fetch_ip_tries == UNSET_VALUE
+        @ssh_ip_addr = nil if @ssh_ip_addr == UNSET_VALUE
         @privileged = true if @privileged == UNSET_VALUE
       end
     end

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "1.4.2"
+    VERSION = "1.4.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Linux Containers provider for Vagrant