Skip to content

Commit 5eaba55

Browse files
committed
testing: use controllerHostEntry module in testing
We set some actual controller IP via the new module, allowing us to remove the custom extraHosts entry that was used previously.
1 parent 1995b2c commit 5eaba55

1 file changed

Lines changed: 19 additions & 15 deletions

File tree

modules/testing/default.nix

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,30 @@ let
1313
common =
1414
{ pkgs, lib, ... }:
1515
{
16-
system.stateVersion = lib.trivial.release;
16+
imports = [
17+
../generic/controllerHostEntry.nix
18+
];
1719

18-
services.getty.autologinUser = "root";
20+
config = {
21+
system.stateVersion = lib.trivial.release;
1922

20-
networking.extraHosts = ''
21-
10.0.0.11 controller controller.local
22-
'';
23+
services.getty.autologinUser = "root";
2324

24-
networking = {
25-
useDHCP = false;
26-
networkmanager.enable = false;
27-
useNetworkd = true;
28-
firewall.enable = false;
29-
};
25+
openstack.controllerIP = "10.0.0.11";
3026

31-
environment.systemPackages = [
32-
pkgs.openstackclient
33-
];
27+
networking = {
28+
useDHCP = false;
29+
networkmanager.enable = false;
30+
useNetworkd = true;
31+
firewall.enable = false;
32+
};
3433

35-
environment.variables = adminEnv;
34+
environment.systemPackages = [
35+
pkgs.openstackclient
36+
];
37+
38+
environment.variables = adminEnv;
39+
};
3640
};
3741
in
3842
{

0 commit comments

Comments
 (0)