diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-11-12 07:18:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-12 07:18:18 -0500 |
| commit | cbe7ca77dbc1370cb48331dee14a0b13d8746241 (patch) | |
| tree | ac7be58fc1ae536b7130760f6f3e914f4f758753 /nixos | |
| parent | 852b365928bf0e54b5823a0e80aa071e7a57ed43 (diff) | |
| parent | c1dca9e40b7f357460f69e08e568b242c6e1bdfa (diff) | |
| download | nixpkgs-cbe7ca77dbc1370cb48331dee14a0b13d8746241.tar nixpkgs-cbe7ca77dbc1370cb48331dee14a0b13d8746241.tar.gz nixpkgs-cbe7ca77dbc1370cb48331dee14a0b13d8746241.tar.bz2 nixpkgs-cbe7ca77dbc1370cb48331dee14a0b13d8746241.tar.lz nixpkgs-cbe7ca77dbc1370cb48331dee14a0b13d8746241.tar.xz nixpkgs-cbe7ca77dbc1370cb48331dee14a0b13d8746241.tar.zst nixpkgs-cbe7ca77dbc1370cb48331dee14a0b13d8746241.zip | |
Merge pull request #20351 from bachp/etcd-new-port
etcd: make all service using etc go to 127.0.0.1:2379 by default
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/cluster/fleet.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/cluster/panamax.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/skydns.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix index 78d4ea93c49..ec03be39594 100644 --- a/nixos/modules/services/cluster/fleet.nix +++ b/nixos/modules/services/cluster/fleet.nix @@ -28,7 +28,7 @@ in { etcdServers = mkOption { type = types.listOf types.str; - default = [ "http://127.0.0.1:4001" ]; + default = [ "http://127.0.0.1:2379" ]; description = '' Fleet list of etcd endpoints to use. ''; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 4bdd7f95f77..19303e97a70 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -23,7 +23,7 @@ in { etcdServers = mkOption { description = "Kubernetes list of etcd servers to watch."; - default = [ "127.0.0.1:4001" ]; + default = [ "127.0.0.1:2379" ]; type = types.listOf types.str; }; diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix index b47ff744fc2..4475e8d8c24 100644 --- a/nixos/modules/services/cluster/panamax.nix +++ b/nixos/modules/services/cluster/panamax.nix @@ -46,7 +46,7 @@ in { fleetctlEndpoint = mkOption { type = types.str; - default = "http://127.0.0.1:4001"; + default = "http://127.0.0.1:2379"; description = '' Panamax fleetctl endpoint. ''; diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix index ba913482e3c..6ad18bb2240 100644 --- a/nixos/modules/services/networking/skydns.nix +++ b/nixos/modules/services/networking/skydns.nix @@ -11,7 +11,7 @@ in { etcd = { machines = mkOption { - default = [ "http://localhost:4001" ]; + default = [ "http://127.0.0.1:2379" ]; type = types.listOf types.str; description = "Skydns list of etcd endpoints to connect to."; }; |