ref(contrib): use etcd.service, not etcd2

Author: mboersma

contrib/aws/gen-json.py

@@ -73,7 +73,7 @@
   Description=Prepares the etcd data directory
   Requires=media-etcd.mount
   After=media-etcd.mount
-  Before=etcd2.service
+  Before=etcd.service
   [Service]
   Type=oneshot
   RemainAfterExit=yes

contrib/azure/azure-coreos-cluster

@@ -68,7 +68,7 @@ coreos:
     addr: $private_ipv4:4001
     peer-addr: $private_ipv4:7001
   units:
-    - name: etcd2.service
+    - name: etcd.service
       command: start
     - name: fleet.service
       command: start

contrib/coreos/user-data.example

@@ -9,8 +9,6 @@ coreos:
     etcd_request_timeout: 3.0
   units:
   - name: etcd.service
-    mask: true
-  - name: etcd2.service
     command: start
     content: |
       [Unit]
@@ -50,6 +48,8 @@ coreos:
         --election-timeout ${ETCD_ELECTION_TIMEOUT} \
         --discovery #DISCOVERY_URL
       ExecStop=-/usr/bin/docker stop $ETCD_NAME
+  - name: etcd2.service
+    mask: true
   - name: docker-tcp.socket
     command: start
     enable: true
@@ -78,8 +78,8 @@ coreos:
       [Unit]
       Description=Clean up
       DefaultDependencies=no
-      After=fleet.service etcd2.service docker.service docker.socket deis-store-admin.service deis-store-daemon.service deis-store-volume.service deis-store-monitor.service
-      Requires=fleet.service etcd2.service deis-store-admin.service deis-store-daemon.service deis-store-volume.service docker.service docker.socket deis-store-monitor.service
+      After=fleet.service etcd.service docker.service docker.socket deis-store-admin.service deis-store-daemon.service deis-store-volume.service deis-store-monitor.service
+      Requires=fleet.service etcd.service deis-store-admin.service deis-store-daemon.service deis-store-volume.service docker.service docker.socket deis-store-monitor.service
 
       [Install]
       WantedBy=shutdown.target halt.target reboot.target

deisctl/units/deis-logspout.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=deis-logspout
-Requires=docker.socket etcd2.service
-After=docker.socket etcd2.service
+Requires=docker.socket etcd.service
+After=docker.socket etcd.service
 
 [Service]
 EnvironmentFile=/etc/environment

deisctl/units/deis-publisher.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=deis-publisher
-Requires=docker.socket etcd2.service
-After=docker.socket etcd2.service
+Requires=docker.socket etcd.service
+After=docker.socket etcd.service
 
 [Service]
 EnvironmentFile=/etc/environment