diff options
| author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2019-02-15 19:55:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-15 19:55:56 +0100 |
| commit | 5ae048071d8a3385f2c4aff75947cc508c0b2641 (patch) | |
| tree | ca22c52db5c5af5a7b849c656801cbb248cb29ef /nixos/tests | |
| parent | 2912c1c8ac54bfcf1517637a65d0a9ffc107a450 (diff) | |
| parent | 94136fdc1b6c0eb71d10b27a9a2cb597d73ca33e (diff) | |
| download | nixlib-5ae048071d8a3385f2c4aff75947cc508c0b2641.tar nixlib-5ae048071d8a3385f2c4aff75947cc508c0b2641.tar.gz nixlib-5ae048071d8a3385f2c4aff75947cc508c0b2641.tar.bz2 nixlib-5ae048071d8a3385f2c4aff75947cc508c0b2641.tar.lz nixlib-5ae048071d8a3385f2c4aff75947cc508c0b2641.tar.xz nixlib-5ae048071d8a3385f2c4aff75947cc508c0b2641.tar.zst nixlib-5ae048071d8a3385f2c4aff75947cc508c0b2641.zip | |
Merge pull request #55649 from johanot/flannel-with-kubernetes-backend
nixos/flannel: add kubernetes as storage backend (and fix test)
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/flannel.nix | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7e207fa419f8..229f2c3abf7b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -73,6 +73,7 @@ in ferm = handleTest ./ferm.nix {}; firefox = handleTest ./firefox.nix {}; firewall = handleTest ./firewall.nix {}; + flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; flatpak = handleTest ./flatpak.nix {}; fsck = handleTest ./fsck.nix {}; fwupd = handleTestOn ["x86_64-linux"] ./fwupd.nix {}; # libsmbios is unsupported on aarch64 diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix index fb66fe282090..0b261a684772 100644 --- a/nixos/tests/flannel.nix +++ b/nixos/tests/flannel.nix @@ -21,8 +21,9 @@ import ./make-test.nix ({ pkgs, ...} : rec { services = { etcd = { enable = true; - listenClientUrls = ["http://etcd:2379"]; - listenPeerUrls = ["http://etcd:2380"]; + listenClientUrls = ["http://0.0.0.0:2379"]; # requires ip-address for binding + listenPeerUrls = ["http://0.0.0.0:2380"]; # requires ip-address for binding + advertiseClientUrls = ["http://etcd:2379"]; initialAdvertisePeerUrls = ["http://etcd:2379"]; initialCluster = ["etcd=http://etcd:2379"]; }; |