From 9ffe04f62f7f17b9a8fc41aa96ed649c4e4789ae Mon Sep 17 00:00:00 2001
From: Reyk Floeter <reyk@esdenera.com>
Date: Mon, 7 May 2018 18:10:27 +0200
Subject: [PATCH] Fall back to meta-data/public-keys if
 meta-data/public-keys/0/openssh-key is not available.

---
 agent/cloudinit.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/agent/cloudinit.c b/agent/cloudinit.c
index 5247a35..91149ac 100644
--- a/agent/cloudinit.c
+++ b/agent/cloudinit.c
@@ -77,7 +77,9 @@ cloudinit_fetch(struct system_config *sc)
 
 	/* pubkey */
 	if ((str = metadata(sc,
-	    "/latest/meta-data/public-keys/0/openssh-key", LINE)) == NULL)
+	    "/latest/meta-data/public-keys/0/openssh-key", LINE)) == NULL &&
+	    (str = metadata(sc,
+	    "/latest/meta-data/public-keys", LINE)) == NULL)
 		goto fail;
 	if (agent_addpubkey(sc, str, NULL) != 0)
 		goto fail;