From 91c607848809000721c2847a374c5c48774e8c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20Dj=C3=A4rv?= <mathias.djarv@gmail.com>
Date: Thu, 3 May 2018 12:50:44 +0200
Subject: [PATCH 1/2] create-basic-configdrive: update etcd v2 to etcd v3

etcd v2 has been deprecated and is replaced with etcd v3 (etcd-member)
---
 contrib/create-basic-configdrive | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/create-basic-configdrive b/contrib/create-basic-configdrive
index ece7849c6c..278df8d73d 100755
--- a/contrib/create-basic-configdrive
+++ b/contrib/create-basic-configdrive
@@ -26,7 +26,7 @@ This tool creates a basic config-drive ISO image.
 CLOUD_CONFIG="#cloud-config
 
 coreos:
-  etcd2:
+  etcd-member:
     name: <ETCD_NAME>
     advertise-client-urls: <ETCD_ADDR>
     initial-advertise-peer-urls: <ETCD_PEER_URLS>
@@ -34,7 +34,7 @@ coreos:
     listen-peer-urls: <ETCD_LISTEN_PEER_URLS>
     listen-client-urls: <ETCD_LISTEN_CLIENT_URLS>
   units:
-    - name: etcd2.service
+    - name: etcd-member.service
       command: start
     - name: fleet.service
       command: start

From 04c3ba054b569deb3f2ef003c3c3d46c2c6c30b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20Dj=C3=A4rv?= <mathias.djarv@gmail.com>
Date: Mon, 7 May 2018 09:37:34 +0200
Subject: [PATCH 2/2] create-basic-configdrive: remove fleet service

---
 contrib/create-basic-configdrive | 2 --
 1 file changed, 2 deletions(-)

diff --git a/contrib/create-basic-configdrive b/contrib/create-basic-configdrive
index 278df8d73d..0c504d449b 100755
--- a/contrib/create-basic-configdrive
+++ b/contrib/create-basic-configdrive
@@ -36,8 +36,6 @@ coreos:
   units:
     - name: etcd-member.service
       command: start
-    - name: fleet.service
-      command: start
 ssh_authorized_keys:
   - <SSH_KEY>
 hostname: <HOSTNAME>