Merge pull request #12152 from dpausp/fix-nixos-networking
Fix network config for recent NixOS releases
This commit is contained in:
commit
990d94ed9d
@ -1,16 +1,15 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
networking.interfaces = [
|
||||
networking.interfaces = {
|
||||
<% networks.select {|n| n[:device]}.each do |network| %>
|
||||
{
|
||||
name = "<%= network[:device] %>";
|
||||
<%= network[:device] %>.ipv4.addresses = [{
|
||||
<% if network[:type] == :static %>
|
||||
ipAddress = "<%= network[:ip] %>";
|
||||
address = "<%= network[:ip] %>";
|
||||
<% end %>
|
||||
<% if network[:prefix_length] %>
|
||||
prefixLength = <%= network[:prefix_length] %>;
|
||||
<% end %>
|
||||
}
|
||||
}];
|
||||
<% end %>
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
27
test/unit/templates/guests/nixos/network_test.rb
Normal file
27
test/unit/templates/guests/nixos/network_test.rb
Normal file
@ -0,0 +1,27 @@
|
||||
require_relative "../../../base"
|
||||
|
||||
require "vagrant/util/template_renderer"
|
||||
|
||||
describe "templates/guests/nixos/network" do
|
||||
let(:template) { "guests/nixos/network" }
|
||||
|
||||
it "renders the template" do
|
||||
result = Vagrant::Util::TemplateRenderer.render(template, networks: [{
|
||||
device: "en0",
|
||||
ip: "1.1.1.1",
|
||||
prefix_length: "24",
|
||||
type: :static,
|
||||
}])
|
||||
expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
networking.interfaces = {
|
||||
en0.ipv4.addresses = [{
|
||||
address = "1.1.1.1";
|
||||
prefixLength = 24;
|
||||
}];
|
||||
};
|
||||
}
|
||||
EOH
|
||||
end
|
||||
end
|
||||
Loading…
x
Reference in New Issue
Block a user