Merge pull request #20351 from bachp/etcd-new-port

etcd: make all service using etc go to 127.0.0.1:2379 by default
This commit is contained in:
Graham Christensen 2016-11-12 07:18:18 -05:00 committed by GitHub
commit cbe7ca77db
4 changed files with 4 additions and 4 deletions

View file

@ -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.
'';

View file

@ -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;
};

View file

@ -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.
'';

View file

@ -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.";
};