ref(user-data): use default etcd2 and flannel services

Author: mboersma

Makefile

@@ -34,7 +34,7 @@ discovery-url:
 	@for i in 1 2 3 4 5; do \
 		URL=`curl -s -w '\n' https://discovery.etcd.io/new?size=$$DEIS_NUM_INSTANCES`; \
 		if [ ! -z $$URL ]; then \
-			sed -e "s,discovery #DISCOVERY_URL,discovery $$URL," contrib/coreos/user-data.example > contrib/coreos/user-data; \
+			sed -e "s,discovery: #DISCOVERY_URL,discovery: $$URL," contrib/coreos/user-data.example > contrib/coreos/user-data; \
 			echo "Wrote $$URL to contrib/coreos/user-data"; \
 		    break; \
 		fi; \

Vagrantfile

@@ -78,10 +78,8 @@ Vagrant.configure("2") do |config|
 
   config.trigger.before :up do
     if File.exists?(CLOUD_CONFIG_PATH) && !File.readlines(CLOUD_CONFIG_PATH).grep(/\s*discovery #DISCOVERY_URL/).any?
-      # Vagrant binds the VMs IP in VirtualBox's bridge network to the eth1 interface instead of eth0.
-      # This necessitates the substitution below, which is not required anywhere except in Vagrant.
       user_data = File.read(CLOUD_CONFIG_PATH)
-      new_userdata = user_data.gsub("/opt/bin/flanneld --ip-masq=true", "/opt/bin/flanneld --iface=eth1 --ip-masq=true")
+      new_userdata = user_data.gsub("coreos:", "coreos:\n  flannel:\n    interface: $public_ipv4")
       File.open(CLOUD_CONFIG_PATH, "w") {|file| file.puts new_userdata }
     else
       raise Vagrant::Errors::VagrantError.new, "Run 'make discovery-url' first to create user-data."

contrib/aws/gen-json.py

@@ -73,7 +73,7 @@
   Description=Prepares the etcd data directory
   Requires=media-etcd.mount
   After=media-etcd.mount
-  Before=etcd.service
+  Before=etcd2.service
   [Service]
   Type=oneshot
   RemainAfterExit=yes
@@ -92,7 +92,7 @@
     dict({'name': 'format-etcd-volume.service', 'command': 'start', 'content': FORMAT_ETCD_VOLUME}),
     dict({'name': 'media-etcd.mount', 'command': 'start', 'content': MOUNT_ETCD_VOLUME}),
     dict({'name': 'prepare-etcd-data-directory.service', 'command': 'start', 'content': PREPARE_ETCD_DATA_DIRECTORY}),
-    dict({'name': 'etcd.service', 'drop-ins': [{'name': '90-after-etcd-volume.conf', 'content': ETCD_DROPIN}]})
+    dict({'name': 'etcd2.service', 'drop-ins': [{'name': '90-after-etcd-volume.conf', 'content': ETCD_DROPIN}]})
 ]
 
 with open(os.path.join(CURR_DIR, '..', 'coreos', 'user-data'), 'r') as f:

contrib/azure/azure-coreos-cluster

@@ -61,14 +61,19 @@ parser.add_argument('--no-discovery-url', action='store_true',
 cloud_init_template = """#cloud-config
 
 coreos:
-  etcd:
+  etcd2:
     # generate a new token for each unique cluster from https://discovery.etcd.io/new
     discovery: {0}
-    # deployments across multiple cloud services will need to use $public_ipv4
-    addr: $private_ipv4:4001
-    peer-addr: $private_ipv4:7001
+    # multi-region and multi-cloud deployments need to use $public_ipv4
+    advertise-client-urls: http://$private_ipv4:2379
+    initial-advertise-peer-urls: http://$private_ipv4:2380
+    # listen on both the official ports and the legacy ports
+    # legacy ports can be omitted if your application doesn't depend on them
+    listen-client-urls: http://0.0.0.0:2379,http://0.0.0.0:4001
+    listen-peer-urls: http://$private_ipv4:2380,http://$private_ipv4:7001
+    data-dir: /var/lib/etcd2
   units:
-    - name: etcd.service
+    - name: etcd2.service
       command: start
     - name: fleet.service
       command: start