From 0c636fe977a4503dd2ff6ec6d1316606f9d7ff44 Mon Sep 17 00:00:00 2001

From: Jan Chaloupka <jchaloup@redhat.com>

Date: Thu, 17 Sep 2015 14:44:33 +0200

Subject: [PATCH] change coreos.com/network to atomic.io/network in help and

 docs

---

 Documentation/aws-vpc-backend.md |  2 +-

 Documentation/gce-backend.md     |  2 +-

 README.md                        | 10 +++++-----

 main.go                          |  2 +-

 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/aws-vpc-backend.md b/Documentation/aws-vpc-backend.md

index abd6218..bf045bb 100644

--- a/Documentation/aws-vpc-backend.md

+++ b/Documentation/aws-vpc-backend.md

@@ -114,7 +114,7 @@ $ etcd2 -advertise-client-urls http://$INTERNAL_IP:2379 -listen-client-urls http

 - Publish configuration in etcd (ensure that the network range does not overlap with the one configured for the VPC)

 ```

-$ etcdctl set /coreos.com/network/config '{"Network":"10.20.0.0/16", "Backend": {"Type": "aws-vpc"}}'

+$ etcdctl set /atomic.io/network/config '{"Network":"10.20.0.0/16", "Backend": {"Type": "aws-vpc"}}'

 ```

 - Fetch the latest release using wget from [here](https://github.com/coreos/flannel/releases/download/v0.5.0/flannel-0.5.0-linux-amd64.tar.gz)

 - Run flannel daemon:

diff --git a/Documentation/gce-backend.md b/Documentation/gce-backend.md

index 50245b4..595839b 100644

--- a/Documentation/gce-backend.md

+++ b/Documentation/gce-backend.md

@@ -44,7 +44,7 @@ $ etcd2 -advertise-client-urls http://$INTERNAL_IP:2379 -listen-client-urls http

 - Publish configuration in etcd (ensure that the network range does not overlap with the one configured for the GCE network)

 ```

-$ etcdctl set /coreos.com/network/config '{"Network":"10.40.0.0/16", "Backend": {"Type": "gce"}}'

+$ etcdctl set /atomic.io/network/config '{"Network":"10.40.0.0/16", "Backend": {"Type": "gce"}}'

 ```

 - Fetch the 0.5 release using wget from [here](https://github.com/coreos/flannel/releases/download/v0.5.0/flannel-0.5.0-linux-amd64.tar.gz)

diff --git a/README.md b/README.md

index d27d954..f31552b 100644

--- a/README.md

+++ b/README.md

@@ -41,7 +41,7 @@ docker run -v $SRC:/opt/flannel -i -t google/golang /bin/bash -c "cd /opt/flanne

 ## Configuration

 flannel reads its configuration from etcd.

-By default, it will read the configuration from `/coreos.com/network/config` (can be overridden via `--etcd-prefix`).

+By default, it will read the configuration from `/atomic.io/network/config` (can be overridden via `--etcd-prefix`).

 You can use `etcdctl` utility to set values in etcd.

 The value of the config is a JSON dictionary with the following keys:

@@ -143,9 +143,9 @@ Multi-network mode allows a single flannel daemon to join multiple networks.

 Each network is independent from each other and has its own configuration, IP space, interfaces.

 To configure three networks -- in this example named `blue`, `green`, and `red` -- start by publishing their configurations to etcd in different locations:

 ```

-$ etcdctl set /coreos.com/network/blue/config  '{ "Network": "10.1.0.0/16", "Backend": { "Type": "vxlan", "VNI": 1 } }'

-$ etcdctl set /coreos.com/network/green/config '{ "Network": "10.2.0.0/16", "Backend": { "Type": "vxlan", "VNI": 2 } }'

-$ etcdctl set /coreos.com/network/red/config   '{ "Network": "10.3.0.0/16", "Backend": { "Type": "vxlan", "VNI": 3 } }'

+$ etcdctl set /atomic.io/network/blue/config  '{ "Network": "10.1.0.0/16", "Backend": { "Type": "vxlan", "VNI": 1 } }'

+$ etcdctl set /atomic.io/network/green/config '{ "Network": "10.2.0.0/16", "Backend": { "Type": "vxlan", "VNI": 2 } }'

+$ etcdctl set /atomic.io/network/red/config   '{ "Network": "10.3.0.0/16", "Backend": { "Type": "vxlan", "VNI": 3 } }'

 ```

 Next, start the flannel daemon, specifying the networks to join:

@@ -179,7 +179,7 @@ $ flanneld --remote=10.0.0.3:8888 --networks=blue,green

 ```

 --public-ip="": IP accessible by other nodes for inter-host communication. Defaults to the IP of the interface being used for communication.

 --etcd-endpoints=http://127.0.0.1:2379: a comma-delimited list of etcd endpoints.

---etcd-prefix=/coreos.com/network: etcd prefix.

+--etcd-prefix=/atomic.io/network: etcd prefix.

 --etcd-keyfile="": SSL key file used to secure etcd communication.

 --etcd-certfile="": SSL certification file used to secure etcd communication.

 --etcd-cafile="": SSL Certificate Authority file used to secure etcd communication.

diff --git a/main.go b/main.go

index 88298bc..e0ccd22 100644

--- a/main.go

+++ b/main.go

@@ -63,7 +63,7 @@ var opts CmdLineOpts

 func init() {

 	flag.StringVar(&opts.publicIP, "public-ip", "", "IP accessible by other nodes for inter-host communication")

 	flag.StringVar(&opts.etcdEndpoints, "etcd-endpoints", "http://127.0.0.1:2379", "a comma-delimited list of etcd endpoints")

-	flag.StringVar(&opts.etcdPrefix, "etcd-prefix", "/coreos.com/network", "etcd prefix")

+	flag.StringVar(&opts.etcdPrefix, "etcd-prefix", "/atomic.io/network", "etcd prefix")

 	flag.StringVar(&opts.etcdKeyfile, "etcd-keyfile", "", "SSL key file used to secure etcd communication")

 	flag.StringVar(&opts.etcdCertfile, "etcd-certfile", "", "SSL certification file used to secure etcd communication")

 	flag.StringVar(&opts.etcdCAFile, "etcd-cafile", "", "SSL Certificate Authority file used to secure etcd communication")

-- 

1.9.3