Branch: refs/heads/master
Home: https://github.com/NixOS/nixops
Commit: 2a76f9c95795c27f53c1a26cd1167f5170718958
https://github.com/NixOS/nixops/commit/2a76f9c95795c27f53c1a26cd1167f5170718958
Author: aszlig <[email protected]>
Date: 2015-10-21 (Wed, 21 Oct 2015)
Changed paths:
M tests/none-backend.nix
Log Message:
-----------
tests/none: Properly propagate store dependencies.
Because the coordinator machine needs to build the test machines, we
need to make sure that every package that can't be built without
networking is already available.
So far, the test has used environment.systemPackages to add those
references. However, using pkgs.stdenv won't export a single reference
to the store path of stdenv, because it doesn't contain any paths that
are in the default environment.pathsToLink.
This usually shouldn't be a problem, because stdenv had a
nix-support/propagated-user-env-packages file, which made sure that
every package listed there was recursively added to the system path as
well.
Unfortunately, since NixOS/nixpkgs@328f7a6, stdenv doesn't contain
propagatedUserEnvPkgs anymore, so these dependencies aren't available to
the coordinator machine anymore.
Either way, if any of the packages listed in environment.systemPackages
do not contain paths that are not in environment.pathsToLink, we don't
get any reference to the path and that in turn might lead to unexpected
behaviour.
One example I can think of is if /lib is removed from pathsToLink, which
is already marked as "FIXME: remove" since NixOS/nixpkgs@e636e0a.
Signed-off-by: aszlig <[email protected]>
Commit: 92a1651b31e19ca89067edc8ff9b16074d3fde0e
https://github.com/NixOS/nixops/commit/92a1651b31e19ca89067edc8ff9b16074d3fde0e
Author: aszlig <[email protected]>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M tests/none-backend.nix
Log Message:
-----------
tests/none: Fix configuration of load balancer.
The default load balancing method has been split off into its own module
since Apache 2.4, so we need to add that in the config to ensure proper
start up of the web server.
Here are the details about the module:
https://httpd.apache.org/docs/2.4/mod/mod_lbmethod_byrequests.html
Signed-off-by: aszlig <[email protected]>
Commit: a2691454ab8e584f9e8b6510d11978069d7ac572
https://github.com/NixOS/nixops/commit/a2691454ab8e584f9e8b6510d11978069d7ac572
Author: aszlig <[email protected]>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M tests/none-backend.nix
Log Message:
-----------
tests/none: Don't try to remount /nix/store.
We have virtualisation.writableStore active for the targets that are not
yet deployed by NixOps but not within the NixOps network specification.
This has worked regardless in the past, because using a writable store
was implemented solely using boot.initrd.postMountCommands, so switching
to a new configuration didn't change anything and left the store
untouched.
But after NixOS/nixpkgs@e68b0c7, the mounts for the writable store are
now using the fileSystems configuration attribute, which causes the
mount points to be changed on switch.
Another problem is that the mount units weren't escaped properly. But
that isn't the problem here anymore (because we don't change the mounts
between activation) and has been (or is going to be) dealt with in
NixOS/nixpkgs#10546.
Signed-off-by: aszlig <[email protected]>
Commit: 356347f2e9ca251b272deee221d2f0bc6f028e0d
https://github.com/NixOS/nixops/commit/356347f2e9ca251b272deee221d2f0bc6f028e0d
Author: aszlig <[email protected]>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M tests/none-backend.nix
Log Message:
-----------
tests/none: Disable the firewall to physical.nix.
Just an asthetics change, so we have defined it once rather than twice:
Once for each logical specification.
So we spare one line, yay!
Signed-off-by: aszlig <[email protected]>
Commit: 6dcfb6e9f18131758853e00d427ec68bdb05fc8d
https://github.com/NixOS/nixops/commit/6dcfb6e9f18131758853e00d427ec68bdb05fc8d
Author: aszlig <[email protected]>
Date: 2015-10-23 (Fri, 23 Oct 2015)
Changed paths:
M tests/none-backend.nix
Log Message:
-----------
tests/none: Properly set IP addresses for eth1.
This has never been done in this test but it's actually done in
<nixpkgs/nixos/lib/build-vms.nix> using assignIPAddresses.
The reason this hasn't been failing was that the IP address
reconfiguration wasn't done properly back then when this test was
happily succeeding. The implementation in <nixpkgs> actually didn't stop
the interface at all, which is why this passed unnoticed.
Since then, we also have proper networking tests in <nixpkgs>, so we
shouldn't assume a broken implementation in <nixpkgs>.
However, the implementation is still a bit ugly, because we're now
statically setting the IP address instead of reusing assignIPAddresses.
We can't reuse the latter, because it requires us to insert a dummy node
(coordinator), which we can't remove later on because the node name is
referenced in the configuration via getAttrs on the node attribute.
Signed-off-by: aszlig <[email protected]>
Commit: 425079caf0e9f43d9f0a95332fe56a39cc31173a
https://github.com/NixOS/nixops/commit/425079caf0e9f43d9f0a95332fe56a39cc31173a
Author: aszlig <[email protected]>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M tests/none-backend.nix
Log Message:
-----------
tests/none: Switch to system.extraDependencies.
Didn't notice that there is an option just for that, thanks to @edolstra
for the heads-up in:
https://github.com/NixOS/nixops/pull/350#discussion_r42978140
Signed-off-by: aszlig <[email protected]>
Commit: bd56c767788dd0a55577a65b7ce6082be17141b3
https://github.com/NixOS/nixops/commit/bd56c767788dd0a55577a65b7ce6082be17141b3
Author: Eelco Dolstra <[email protected]>
Date: 2015-10-26 (Mon, 26 Oct 2015)
Changed paths:
M tests/none-backend.nix
Log Message:
-----------
Merge pull request #350 from aszlig/fix-none-backend-tests
Fix tests for the "none" backend
Compare: https://github.com/NixOS/nixops/compare/aa708f545030...bd56c767788d_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
