do not assume that cloud-init shortcuts will get everthing righ...

...because it won't (as setup-network-environment who populates
*_ipv4 et al. only runs way later).

Also,
 - making sure that in the single node standalone cluster etcd
   really points to itself.
 - use flannel's plain defaults, as they should just be enough
   for the common case.

Signed-off-by: António Meireles <antonio.meireles@reformi.st>

docs/getting-started-guides/aws/cloud-configs/master.yaml

@@ -4,7 +4,7 @@
 hostname: master
 coreos:
   etcd2:
-    name: ${DEFAULT_IPV4}
+    name: master
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     advertise-client-urls: http://<master-private-ip>:2379,http://<master-private-ip>:4001
     initial-cluster-token: k8s_etcd
@@ -14,8 +14,6 @@ coreos:
     initial-cluster-state: new
   fleet:
     metadata: "role=master"
-  flannel:
-    interface: eth1
   units:
     - name: setup-network-environment.service
       command: start

docs/getting-started-guides/aws/cloud-configs/node.yaml

@@ -11,14 +11,11 @@ write-files:
       exit $?
 coreos:
   etcd2:
-    name: ${DEFAULT_IPV4}
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     initial-cluster: master=http://<master-private-ip>:2380
     proxy: on
   fleet:
     metadata: "role=node"
-  flannel:
-    interface: eth1
   units:
     - name: fleet.service
       command: start

docs/getting-started-guides/coreos/cloud-configs/master.yaml

@@ -4,7 +4,7 @@
 hostname: master
 coreos:
   etcd2:
-    name: ${DEFAULT_IPV4}
+    name: master
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     advertise-client-urls: http://<master-private-ip>:2379,http://<master-private-ip>:4001
     initial-cluster-token: k8s_etcd
@@ -14,7 +14,6 @@ coreos:
     initial-cluster-state: new
   fleet:
     metadata: "role=master"
-  flannel:
   units:
     - name: setup-network-environment.service
       command: start

docs/getting-started-guides/coreos/cloud-configs/node.yaml

@@ -11,14 +11,11 @@ write-files:
       exit $?
 coreos:
   etcd2:
-    name: ${DEFAULT_IPV4}
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     initial-cluster: master=http://<master-private-ip>:2380
     proxy: on
   fleet:
     metadata: "role=node"
-  flannel:
-    etcd_endpoints: http://<master-private-ip>:4001
   units:
     - name: fleet.service
       command: start
@@ -30,8 +27,6 @@ coreos:
             [Unit]
             Requires=etcd2.service
             [Service]
-            Environment=ETCDCTL_PEERS=http://<master-private-ip>:4001
-            ExecStartPre=/bin/bash -c "until curl http://<master-private-ip>:4001/v2/machines; do sleep 2; done"
             ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
     - name: docker.service
       command: start

docs/getting-started-guides/coreos/cloud-configs/standalone.yaml

@@ -2,19 +2,17 @@
 
 ---
 write_files:
-hostname: standalone
+hostname: master
 coreos:
   etcd2:
-    name: ${DEFAULT_IPV4}
+    name: master
     listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
-    advertise-client-urls: http://<master-private-ip>:2379,http://<master-private-ip>:4001
+    advertise-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
     initial-cluster-token: k8s_etcd
-    listen-peer-urls: http://<master-private-ip>:2380,http://<master-private-ip>:7001
-    initial-advertise-peer-urls: http://<master-private-ip>:2380
-    initial-cluster: master=http://<master-private-ip>:2380"
+    listen-peer-urls: http://0.0.0.0:2380,http://0.0.0.0:7001
+    initial-advertise-peer-urls: http://0.0.0.0:2380
+    initial-cluster: master=http://0.0.0.0:2380"
     initial-cluster-state: new
-  flannel:
-    interface: eth1
   units:
     - name: etcd.service
       command: start