Blame change-coreos.com-network-to-atomic.io-network-in-he.patch

c4a863
From 0c636fe977a4503dd2ff6ec6d1316606f9d7ff44 Mon Sep 17 00:00:00 2001
c4a863
From: Jan Chaloupka <jchaloup@redhat.com>
c4a863
Date: Thu, 17 Sep 2015 14:44:33 +0200
c4a863
Subject: [PATCH] change coreos.com/network to atomic.io/network in help and
c4a863
 docs
c4a863
c4a863
---
c4a863
 Documentation/aws-vpc-backend.md |  2 +-
c4a863
 Documentation/gce-backend.md     |  2 +-
c4a863
 README.md                        | 10 +++++-----
c4a863
 main.go                          |  2 +-
c4a863
 4 files changed, 8 insertions(+), 8 deletions(-)
c4a863
c4a863
diff --git a/Documentation/aws-vpc-backend.md b/Documentation/aws-vpc-backend.md
c4a863
index abd6218..bf045bb 100644
c4a863
--- a/Documentation/aws-vpc-backend.md
c4a863
+++ b/Documentation/aws-vpc-backend.md
c4a863
@@ -114,7 +114,7 @@ $ etcd2 -advertise-client-urls http://$INTERNAL_IP:2379 -listen-client-urls http
c4a863
 - Publish configuration in etcd (ensure that the network range does not overlap with the one configured for the VPC)
c4a863
 
c4a863
 ```
c4a863
-$ etcdctl set /coreos.com/network/config '{"Network":"10.20.0.0/16", "Backend": {"Type": "aws-vpc"}}'
c4a863
+$ etcdctl set /atomic.io/network/config '{"Network":"10.20.0.0/16", "Backend": {"Type": "aws-vpc"}}'
c4a863
 ```
c4a863
 - 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)
c4a863
 - Run flannel daemon:
c4a863
diff --git a/Documentation/gce-backend.md b/Documentation/gce-backend.md
c4a863
index 50245b4..595839b 100644
c4a863
--- a/Documentation/gce-backend.md
c4a863
+++ b/Documentation/gce-backend.md
c4a863
@@ -44,7 +44,7 @@ $ etcd2 -advertise-client-urls http://$INTERNAL_IP:2379 -listen-client-urls http
c4a863
 - Publish configuration in etcd (ensure that the network range does not overlap with the one configured for the GCE network)
c4a863
 
c4a863
 ```
c4a863
-$ etcdctl set /coreos.com/network/config '{"Network":"10.40.0.0/16", "Backend": {"Type": "gce"}}'
c4a863
+$ etcdctl set /atomic.io/network/config '{"Network":"10.40.0.0/16", "Backend": {"Type": "gce"}}'
c4a863
 ```
c4a863
 
c4a863
 - 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)
c4a863
diff --git a/README.md b/README.md
c4a863
index d27d954..f31552b 100644
c4a863
--- a/README.md
c4a863
+++ b/README.md
c4a863
@@ -41,7 +41,7 @@ docker run -v $SRC:/opt/flannel -i -t google/golang /bin/bash -c "cd /opt/flanne
c4a863
 ## Configuration
c4a863
 
c4a863
 flannel reads its configuration from etcd.
c4a863
-By default, it will read the configuration from `/coreos.com/network/config` (can be overridden via `--etcd-prefix`).
c4a863
+By default, it will read the configuration from `/atomic.io/network/config` (can be overridden via `--etcd-prefix`).
c4a863
 You can use `etcdctl` utility to set values in etcd.
c4a863
 The value of the config is a JSON dictionary with the following keys:
c4a863
 
c4a863
@@ -143,9 +143,9 @@ Multi-network mode allows a single flannel daemon to join multiple networks.
c4a863
 Each network is independent from each other and has its own configuration, IP space, interfaces.
c4a863
 To configure three networks -- in this example named `blue`, `green`, and `red` -- start by publishing their configurations to etcd in different locations:
c4a863
 ```
c4a863
-$ etcdctl set /coreos.com/network/blue/config  '{ "Network": "10.1.0.0/16", "Backend": { "Type": "vxlan", "VNI": 1 } }'
c4a863
-$ etcdctl set /coreos.com/network/green/config '{ "Network": "10.2.0.0/16", "Backend": { "Type": "vxlan", "VNI": 2 } }'
c4a863
-$ etcdctl set /coreos.com/network/red/config   '{ "Network": "10.3.0.0/16", "Backend": { "Type": "vxlan", "VNI": 3 } }'
c4a863
+$ etcdctl set /atomic.io/network/blue/config  '{ "Network": "10.1.0.0/16", "Backend": { "Type": "vxlan", "VNI": 1 } }'
c4a863
+$ etcdctl set /atomic.io/network/green/config '{ "Network": "10.2.0.0/16", "Backend": { "Type": "vxlan", "VNI": 2 } }'
c4a863
+$ etcdctl set /atomic.io/network/red/config   '{ "Network": "10.3.0.0/16", "Backend": { "Type": "vxlan", "VNI": 3 } }'
c4a863
 ```
c4a863
 
c4a863
 Next, start the flannel daemon, specifying the networks to join:
c4a863
@@ -179,7 +179,7 @@ $ flanneld --remote=10.0.0.3:8888 --networks=blue,green
c4a863
 ```
c4a863
 --public-ip="": IP accessible by other nodes for inter-host communication. Defaults to the IP of the interface being used for communication.
c4a863
 --etcd-endpoints=http://127.0.0.1:2379: a comma-delimited list of etcd endpoints.
c4a863
---etcd-prefix=/coreos.com/network: etcd prefix.
c4a863
+--etcd-prefix=/atomic.io/network: etcd prefix.
c4a863
 --etcd-keyfile="": SSL key file used to secure etcd communication.
c4a863
 --etcd-certfile="": SSL certification file used to secure etcd communication.
c4a863
 --etcd-cafile="": SSL Certificate Authority file used to secure etcd communication.
c4a863
diff --git a/main.go b/main.go
c4a863
index 88298bc..e0ccd22 100644
c4a863
--- a/main.go
c4a863
+++ b/main.go
c4a863
@@ -63,7 +63,7 @@ var opts CmdLineOpts
c4a863
 func init() {
c4a863
 	flag.StringVar(&opts.publicIP, "public-ip", "", "IP accessible by other nodes for inter-host communication")
c4a863
 	flag.StringVar(&opts.etcdEndpoints, "etcd-endpoints", "http://127.0.0.1:2379", "a comma-delimited list of etcd endpoints")
c4a863
-	flag.StringVar(&opts.etcdPrefix, "etcd-prefix", "/coreos.com/network", "etcd prefix")
c4a863
+	flag.StringVar(&opts.etcdPrefix, "etcd-prefix", "/atomic.io/network", "etcd prefix")
c4a863
 	flag.StringVar(&opts.etcdKeyfile, "etcd-keyfile", "", "SSL key file used to secure etcd communication")
c4a863
 	flag.StringVar(&opts.etcdCertfile, "etcd-certfile", "", "SSL certification file used to secure etcd communication")
c4a863
 	flag.StringVar(&opts.etcdCAFile, "etcd-cafile", "", "SSL Certificate Authority file used to secure etcd communication")
c4a863
-- 
c4a863
1.9.3
c4a863