swarm-controller: make socketPath readOnly instead of asserting it
readOnly makes a bad socketPath inexpressible rather than diagnosed after the fact. Since readOnly rejects any definition including one arriving through a rename shim, drop the deploy.nix rename entry for it and the fixture line exercising it, and update the controllerOldPath comment's shim count from seven to six. Refs #4208
This commit is contained in:
parent
205986f77e
commit
fcb8a594bb
3 changed files with 3 additions and 27 deletions
|
|
@ -201,13 +201,12 @@ let
|
|||
deploy.matrix.maxRequestSize = 99000000;
|
||||
};
|
||||
|
||||
# `enable` is spelled the OLD way like everything else here, so all seven
|
||||
# of the controller's shims are exercised rather than six.
|
||||
# `enable` is spelled the OLD way like everything else here, so all six
|
||||
# of the controller's shims are exercised rather than five.
|
||||
controllerOldPath = hive {
|
||||
swarm.controller.enable = true;
|
||||
swarm.controller.package = pkgs.emptyDirectory;
|
||||
swarm.controller.swarmctlPackage = pkgs.emptyDirectory;
|
||||
swarm.controller.socketPath = "/run/test-ctrl/ctrl.sock";
|
||||
swarm.controller.forgeTokenFile = "/run/secrets/ctrl-forge.token";
|
||||
swarm.controller.authBridgeUrl = "http://127.0.0.1:19097";
|
||||
swarm.controller.queue.clientSecretFile = "/run/secrets/ctrl-queue.secret";
|
||||
|
|
|
|||
Loading…
Reference in a new issue