vagrant-vlan 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f55078a75af1e44111a5c49ae7928b90facdc47b
-  data.tar.gz: d39d272e37cc3eed46f20aab035d7f3a30442eaa
+  metadata.gz: 32c21847fb705a6c0ac6cee40c670f409b4c5d53
+  data.tar.gz: 4694c011f2209a721ef399339652da623afbd4b3
 SHA512:
-  metadata.gz: 5cf39e099e129a6ffddaadaea73eca4d14cc0ea417ab3658913108b5cdf9b86ea0abe00489bd48d7192e377654e6e0fab1e871601445e7d668cf4c5438073de6
-  data.tar.gz: bc5148510aba3ff4c232bf499eb6ae9badfb5dc8b427e62c109e5bc9af328954ea6d5a89f91102012f58acc6291ef0f2644a25b22d1807be8d4925009c56de88
+  metadata.gz: a320d21efd669cc6bbb83c25df6a6c8afacc6707b663cb7e5a0a04feaf6cb9d91efe5590efd5d0e506e81b78f5ade8e5a83bb436723037727cf7939daf6026fb
+  data.tar.gz: b17ace920f8ed260ea2716fa3cae3d9cecefc7a20eab555660d0a4eb2977b44287e0364020b6d5a78b1fb913c787fce2a0d521f5d1ae5970cb061fbb02aee5ab

data/lib/vagrant-vlan/debian/configure_vlans.rb

@@ -13,8 +13,10 @@ module VagrantPlugins
         def self.configure_vlans(machine, vlans)
           machine.communicate.tap do |comm|
             # Verify the kernel module is installed and loaded.
-            if !comm.test("lsmod | grep 8021q")
+            if !comm.test("dpkg -l | grep vlan")
               comm.sudo("apt-get install vlan")
+            end
+            if !comm.test("lsmod | grep 8021q")
               comm.sudo("modprobe 8021q")
             end
 

data/lib/vagrant-vlan/plugin.rb

@@ -15,8 +15,16 @@ module VagrantPlugins
         # configuration middleware) do the actual network configuration on the
         # way up the middleware stack. Therefore, this ensures that we will
         # configure the vlans after the rest of the interfaces.
+
+        # Hook in before VirtualBox provider
         hook.before(VagrantPlugins::ProviderVirtualBox::Action::Network,
                     Action)
+
+        if Vagrant.has_plugin?("vagrant-lxc")
+          require "vagrant-lxc/action"
+          # Hook in before LXC provider if we have one
+          hook.before(Vagrant::LXC::Action::PrivateNetworks, Action)
+        end
       end
 
       config "vlan" do

data/lib/vagrant-vlan/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VLAN
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vlan
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Arctic Wolf Networks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler