vagrant-guests-clearlinux 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0bf27d01315661bbd39dc82ba6c5bbaea3d8e21264be124ba4227184e68dd6
-  data.tar.gz: 3937c110ed621d7db7a1b74e618fac4f68ec62451d5a869e5386ac8bee7eb377
+  metadata.gz: 8a5ff37998160645d4d5cfba0a093ac79ea02c9518d07206b49ad3aaef182f82
+  data.tar.gz: 621632483ec800d37df645eab25e3dc0a0da94af923fee7310455aad52e696c3
 SHA512:
-  metadata.gz: 6af48e6b54266051c699c98e76121050d1cf2530cd5f14af523444b4d127f2c497e983b4194923ab7595b04502f55d74168f42338474a5c3c936648c45f4b605
-  data.tar.gz: 6070645fcefa9fed672be4bfb32c54ce9230a6491379b1a361d949bbc92b04980f8f341cc22c4af0975ea9a762fd55e43ce68993761851de6a5ab5ef434cdef1
+  metadata.gz: ce7079408022f2bbc44f9eea3815967ccf4db6705f0e857d4ae06610458f77520a929903d1a307a4cd9bc006ebaa5586ba8e4edcaf21f4770720e5a9dd67339d
+  data.tar.gz: a2888b7170aa36130242da33059585b529f584a7b499ec217dbed4d2f1dbdd0c6a8035e16294c746f716b6c729693e82bc0b1a2465da66d73614ee80a8763131

data/README.md

@@ -17,7 +17,7 @@ To build and install the plugin directly from this repo:
 ```
 $ bundle install
 $ bundle exec rake build
-$ vagrant plugin install pkg/vagrant-guests-clearlinux-1.0.11.gem
+$ vagrant plugin install pkg/vagrant-guests-clearlinux-1.0.12.gem
 ```
 
 You can run RSpec with:

data/lib/vagrant-guests-clearlinux/cap/configure_networks.rb

@@ -20,6 +20,7 @@ Name=%s
 
 [Network]
 Address=%s
+%s
 #VAGRANT-END
 EOF
 
@@ -38,35 +39,31 @@ module VagrantPlugins
   module GuestClearLinux
     module Cap
       class ConfigureNetworks
+        include Vagrant::Util
+        extend Vagrant::Util::GuestInspection::Linux
+        NETWORKD_DIRECTORY = "/etc/systemd/network".freeze
         @@logger = Log4r::Logger.new('vagrant::guest::clearlinux::configure_networks')
 
         def self.configure_networks(machine, networks)
           comm = machine.communicate
-          # Read network interface names
-          interfaces = []
-          comm.sudo("ifconfig -a | grep -E '^en|^eth' | cut -f1 -d' '") do |_, result|
-            interfaces = result.split("\n")
-          end
-
-          # Configure interfaces
+          interfaces = machine.guest.capability(:network_interfaces)
           networks.each do |network|
             interface = network[:interface].to_i
-
-            iface = interfaces[interface]
-            if iface.nil?
+            device = interfaces[interface]
+            if device.nil?
               @@logger.warn("Could not find match rule for network #{network.inspect}")
               next
             end
-            comm.sudo("mkdir -p /etc/systemd/network/")
-            unit_name = find_network_file comm, iface
-            comm.sudo("rm -f /etc/systemd/network/#{unit_name}")
+            unit_name = format('50-vagrant-%s.network', device)
 
             if network[:type] == :static
               cidr = IPAddr.new(network[:netmask]).to_cidr
-              address = format('%s/%s', network[:ip], cidr)
-              unit_file = format(STATIC_NETWORK, iface, address)
+              address = "#{network[:ip]}/#{cidr}"
+              gateway = ""
+              gateway = "Gateway=#{network[:gateway]}" if network[:gateway]
+              unit_file = format(STATIC_NETWORK, device, address, gateway)
             elsif network[:type] == :dhcp
-              unit_file = format(DHCP_NETWORK, iface)
+              unit_file = format(DHCP_NETWORK, device)
             end
 
             temp = Tempfile.new('vagrant')
@@ -75,16 +72,14 @@ module VagrantPlugins
             temp.close
 
             comm.upload(temp.path, "/tmp/#{unit_name}")
-            comm.sudo(["mv /tmp/#{unit_name} /etc/systemd/network/",
-              "chown root:root /etc/systemd/network/#{unit_name}",
-              "chmod a+r /etc/systemd/network/#{unit_name}"].join("\n"))
+            comm.sudo([ "mkdir -p #{NETWORKD_DIRECTORY}",
+              "rm -f #{NETWORKD_DIRECTORY}/#{unit_name}",
+              "mv /tmp/#{unit_name} #{NETWORKD_DIRECTORY}",
+              "chown root:root #{NETWORKD_DIRECTORY}/#{unit_name}",
+              "chmod a+r #{NETWORKD_DIRECTORY}/#{unit_name}",
+              "systemctl restart systemd-networkd"].join("\n"))
+            comm.wait_for_ready(30)
           end
-          comm.sudo("systemctl restart systemd-networkd")
-          comm.wait_for_ready(30)
-        end
-
-        def self.find_network_file(comm, iface)
-          format('50-vagrant-%s.network', iface)
         end
       end
     end

data/lib/vagrant-guests-clearlinux/version.rb

@@ -4,6 +4,6 @@
 module VagrantPlugins
   # Set version for vagrant-guests-clearlinux gem.
   module GuestClearLinux
-    VERSION = '1.0.11'
+    VERSION = '1.0.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guests-clearlinux
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - António Meireles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler