Modify service dep to etcd2, Vagrant IP to 172.17.89.101

Author: sublimino

bare_metal/user-data

@@ -4,7 +4,7 @@
 # gateway IP is 10.0.1.1
 coreos:
   units:
-    - name: etcd.service
+    - name: etcd2.service
       command: start
     - name: fleet.service
       command: start
@@ -40,8 +40,8 @@ coreos:
         After=docker.service
         Requires=docker.service
 
-        After=etcd.service
-        Requires=etcd.service
+        After=etcd2.service
+        Requires=etcd2.service
         After=fleet.service
         Requires=fleet.service
 
@@ -62,8 +62,8 @@ coreos:
         After=docker.service
         Requires=docker.service
 
-        After=etcd.service
-        Requires=etcd.service
+        After=etcd2.service
+        Requires=etcd2.service
         After=fleet.service
         Requires=fleet.service
 
@@ -85,8 +85,8 @@ coreos:
         [Unit]
         Description=Watch etcd for scheduler public key changes and update authorized_hosts.
 
-        After=etcd.service
-        Requires=etcd.service
+        After=etcd2.service
+        Requires=etcd2.service
         After=fleet.service
         Requires=fleet.service
 

digitalocean/user-data

@@ -11,7 +11,7 @@ coreos:
   fleet:
     public-ip: $public_ipv4
   units:
-    - name: etcd.service
+    - name: etcd2.service
       command: start
     - name: fleet.service
       command: start
@@ -83,8 +83,8 @@ coreos:
         After=docker.service
         Requires=docker.service
 
-        After=etcd.service
-        Requires=etcd.service
+        After=etcd2.service
+        Requires=etcd2.service
         After=fleet.service
         Requires=fleet.service
 
@@ -105,8 +105,8 @@ coreos:
         After=docker.service
         Requires=docker.service
 
-        After=etcd.service
-        Requires=etcd.service
+        After=etcd2.service
+        Requires=etcd2.service
         After=fleet.service
         Requires=fleet.service
 
@@ -128,8 +128,8 @@ coreos:
         [Unit]
         Description=Watch etcd for scheduler public key changes and update authorized_hosts.
 
-        After=etcd.service
-        Requires=etcd.service
+        After=etcd2.service
+        Requires=etcd2.service
         After=fleet.service
         Requires=fleet.service
 

unitfiles/1/paz-orchestrator-announce.service

@@ -3,8 +3,8 @@ Description=paz-orchestrator announce
 BindsTo=paz-orchestrator.service
 After=docker.service
 Requires=docker.service
-After=etcd.service
-Requires=etcd.service
+After=etcd2.service
+Requires=etcd2.service
 After=fleet.service
 
 [Service]

unitfiles/1/paz-orchestrator.service

@@ -2,8 +2,8 @@
 Description=paz-orchestrator: Main API for all paz services and monitor of services in etcd.
 After=docker.service
 Requires=docker.service
-After=etcd.service
-Requires=etcd.service
+After=etcd2.service
+Requires=etcd2.service
 
 [Service]
 User=core

unitfiles/1/paz-scheduler-announce.service

@@ -3,8 +3,8 @@ Description=paz-scheduler announce
 BindsTo=paz-scheduler.service
 After=docker.service
 Requires=docker.service
-After=etcd.service
-Requires=etcd.service
+After=etcd2.service
+Requires=etcd2.service
 
 [Service]
 User=core

unitfiles/1/paz-service-directory-announce.service

@@ -3,8 +3,8 @@ Description=paz-service-directory announce
 BindsTo=paz-service-directory.service
 After=docker.service
 Requires=docker.service
-After=etcd.service
-Requires=etcd.service
+After=etcd2.service
+Requires=etcd2.service
 
 [Service]
 User=core

unitfiles/1/paz-service-directory.service

@@ -2,7 +2,7 @@
 Description=A catalog of services with versioned config for running as Docker containers with systemd
 After=docker.service
 Requires=docker.service
-After=etcd.service
+After=etcd2.service
 
 [Service]
 User=core

unitfiles/2/paz-web-announce.service

@@ -3,7 +3,7 @@ Description=paz-web announce
 BindsTo=paz-web.service
 After=docker.service
 Requires=docker.service
-After=etcd.service
+After=etcd2.service
 
 [Service]
 User=core