diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-12-11 23:32:37 +0100 |
---|---|---|
committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-12-11 23:32:37 +0100 |
commit | 4be10897817f25336856a0a6bcd20582cb130943 (patch) | |
tree | 439b501a64fe24196409381aaf8d47edacf024c3 | |
parent | 1465d9321dd025f625d28d0faa55b64f6021f941 (diff) | |
download | nixpkgs-4be10897817f25336856a0a6bcd20582cb130943.tar nixpkgs-4be10897817f25336856a0a6bcd20582cb130943.tar.gz nixpkgs-4be10897817f25336856a0a6bcd20582cb130943.tar.bz2 nixpkgs-4be10897817f25336856a0a6bcd20582cb130943.tar.lz nixpkgs-4be10897817f25336856a0a6bcd20582cb130943.tar.xz nixpkgs-4be10897817f25336856a0a6bcd20582cb130943.tar.zst nixpkgs-4be10897817f25336856a0a6bcd20582cb130943.zip |
nixos: move kubernetes & fleet to services/cluster
-rwxr-xr-x | nixos/modules/module-list.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/cluster/fleet.nix (renamed from nixos/modules/virtualisation/fleet.nix) | 4 | ||||
-rw-r--r-- | nixos/modules/services/cluster/kubernetes.nix (renamed from nixos/modules/virtualisation/kubernetes.nix) | 16 | ||||
-rw-r--r-- | nixos/tests/fleet.nix | 4 | ||||
-rw-r--r-- | nixos/tests/kubernetes.nix | 4 | ||||
-rw-r--r-- | nixos/tests/mesos.nix | 25 |
6 files changed, 41 insertions, 16 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 36e56a1d152..c6980f3208b 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -102,6 +102,8 @@ ./services/backup/rsnapshot.nix ./services/backup/sitecopy-backup.nix ./services/backup/tarsnap.nix + ./services/cluster/fleet.nix + ./services/cluster/kubernetes.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix ./services/continuous-integration/jenkins/default.nix @@ -400,8 +402,6 @@ ./virtualisation/container-config.nix ./virtualisation/containers.nix ./virtualisation/docker.nix - ./virtualisation/fleet.nix - ./virtualisation/kubernetes.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix #./virtualisation/nova.nix diff --git a/nixos/modules/virtualisation/fleet.nix b/nixos/modules/services/cluster/fleet.nix index f20b58a521d..04d95fbf186 100644 --- a/nixos/modules/virtualisation/fleet.nix +++ b/nixos/modules/services/cluster/fleet.nix @@ -3,12 +3,12 @@ with lib; let - cfg = config.virtualisation.fleet; + cfg = config.services.fleet; in { ##### Interface - options.virtualisation.fleet = { + options.services.fleet = { enable = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/virtualisation/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index e01499822ad..7fd2d77aa82 100644 --- a/nixos/modules/virtualisation/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -3,13 +3,13 @@ with lib; let - cfg = config.virtualisation.kubernetes; + cfg = config.services.kubernetes; in { ###### interface - options.virtualisation.kubernetes = { + options.services.kubernetes = { package = mkOption { description = "Kubernetes package to use."; type = types.package; @@ -420,15 +420,15 @@ in { }) (mkIf (any (el: el == "master") cfg.roles) { - virtualisation.kubernetes.apiserver.enable = mkDefault true; - virtualisation.kubernetes.scheduler.enable = mkDefault true; - virtualisation.kubernetes.controllerManager.enable = mkDefault true; + services.kubernetes.apiserver.enable = mkDefault true; + services.kubernetes.scheduler.enable = mkDefault true; + services.kubernetes.controllerManager.enable = mkDefault true; }) (mkIf (any (el: el == "node") cfg.roles) { virtualisation.docker.enable = mkDefault true; - virtualisation.kubernetes.kubelet.enable = mkDefault true; - virtualisation.kubernetes.proxy.enable = mkDefault true; + services.kubernetes.kubelet.enable = mkDefault true; + services.kubernetes.proxy.enable = mkDefault true; }) (mkIf (any (el: el == "node" || el == "master") cfg.roles) { @@ -442,7 +442,7 @@ in { cfg.kubelet.enable || cfg.proxy.enable ) { - virtualisation.kubernetes.package = mkDefault pkgs.kubernetes; + services.kubernetes.package = mkDefault pkgs.kubernetes; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix index 4e006c00bee..c60f596b6f5 100644 --- a/nixos/tests/fleet.nix +++ b/nixos/tests/fleet.nix @@ -14,7 +14,7 @@ import ./make-test.nix rec { }; }; - virtualisation.fleet = { + services.fleet = { enable = true; metadata.name = "node1"; }; @@ -34,7 +34,7 @@ import ./make-test.nix rec { }; }; - virtualisation.fleet = { + services.fleet = { enable = true; metadata.name = "node2"; }; diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index 3e647026ea4..1ca6153bcb9 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -48,7 +48,7 @@ import ./make-test.nix rec { { config, pkgs, lib, nodes, ... }: { virtualisation.memorySize = 512; - virtualisation.kubernetes = { + services.kubernetes = { roles = ["master" "node"]; controllerManager.machines = ["master" "node"]; kubelet.extraOpts = "-network_container_image=master:5000/pause"; @@ -92,7 +92,7 @@ import ./make-test.nix rec { node = { config, pkgs, lib, nodes, ... }: { - virtualisation.kubernetes = { + services.kubernetes = { roles = ["node"]; kubelet.extraOpts = "-network_container_image=master:5000/pause"; verbose = true; diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix new file mode 100644 index 00000000000..a2b46d7d284 --- /dev/null +++ b/nixos/tests/mesos.nix @@ -0,0 +1,25 @@ +import ./make-test.nix { + name = "simple"; + + machine = { config, pkgs, ... }: { + services.zookeeper.enable = true; + virtualistaion.docker.enable = true; + services.mesos = { + slave = { + enable = true; + master = "zk://localhost:2181/mesos"; + }; + master = { + enable = true; + zk = "zk://localhost:2181/mesos"; + }; + }; + }; + + testScript = + '' + startAll; + $machine->waitForUnit("mesos-master.service"); + $machine->waitForUnit("mesos-slave.service"); + ''; +} |