From 6ff16e081387a042d22ddc24e0f51fd6f81183df Mon Sep 17 00:00:00 2001
From: Dalton Hubble <dghubble@gmail.com>
Date: Wed, 24 Aug 2016 23:50:15 -0700
Subject: [PATCH] examples/ignition/etcd3: Use notify service type

---
 examples/ignition/etcd3-proxy.yaml | 4 +++-
 examples/ignition/etcd3.yaml       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/ignition/etcd3-proxy.yaml b/examples/ignition/etcd3-proxy.yaml
index 3c9c8287..364ddc24 100644
--- a/examples/ignition/etcd3-proxy.yaml
+++ b/examples/ignition/etcd3-proxy.yaml
@@ -8,6 +8,7 @@ systemd:
         Description=etcd3
         Conflicts=etcd2.service
         [Service]
+        Type=notify
         Environment="RKT_OPTS=--volume=resolv,kind=host,source=/etc/resolv.conf --mount volume=resolv,target=/etc/resolv.conf"
         ExecStartPre=/usr/bin/mkdir -p /var/lib/etcd3
         ExecStartPre=/usr/bin/rkt trust --prefix "coreos.com/etcd" --skip-fingerprint-review
@@ -16,13 +17,14 @@ systemd:
           --volume data-dir,kind=host,source=/var/lib/etcd3 \
           --mount volume=data-dir,target=/var/lib/etcd3 \
           $RKT_OPTS \
-          coreos.com/etcd:v3.0.4 -- \
+          coreos.com/etcd:v3.0.6 -- \
           -proxy=on \
           -listen-client-urls=http://0.0.0.0:2379 \
           -initial-cluster={{.etcd_initial_cluster}}
         Restart=always
         RestartSec=0
         LimitNOFILE=40000
+        TimeoutStartSec=0
         [Install]
         WantedBy=multi-user.target
 
diff --git a/examples/ignition/etcd3.yaml b/examples/ignition/etcd3.yaml
index f729ceb9..d6100670 100644
--- a/examples/ignition/etcd3.yaml
+++ b/examples/ignition/etcd3.yaml
@@ -5,6 +5,7 @@ systemd:
       enable: true
       contents: |
         [Unit]
+        Type=notify
         Description=etcd3
         Conflicts=etcd2.service
         [Service]
@@ -16,7 +17,7 @@ systemd:
           --volume data-dir,kind=host,source=/var/lib/etcd3 \
           --mount volume=data-dir,target=/var/lib/etcd3 \
           $RKT_OPTS \
-          coreos.com/etcd:v3.0.4 -- \
+          coreos.com/etcd:v3.0.6 -- \
           -name={{.etcd_name}} \
           -advertise-client-urls=http://{{.domain_name}}:2379 \
           -initial-advertise-peer-urls=http://{{.domain_name}}:2380 \
@@ -27,6 +28,7 @@ systemd:
         Restart=always
         RestartSec=10
         LimitNOFILE=40000
+        TimeoutStartSec=0
         [Install]
         WantedBy=multi-user.target