From 6b2007c34aa73d97507d5dd036f8516fc4f2b5f8 Mon Sep 17 00:00:00 2001
From: Brian Moss <kallimachos@gmail.com>
Date: Thu, 3 Sep 2015 13:24:20 +1000
Subject: [PATCH] XenAPI will not inject ssh-key if cloud-init

The XenAPI does not inject an ssh-key if an image
has the "cloud_init_installed" property. Cloud-init
handles key injection.

Closes-bug: 1206943
Change-Id: Iab2ce12b742599491e47a8643c5b83c8e273ad3c
---
 doc/image-guide/ch_openstack_images.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/image-guide/ch_openstack_images.xml b/doc/image-guide/ch_openstack_images.xml
index e92255fa07..6f6dc31d13 100644
--- a/doc/image-guide/ch_openstack_images.xml
+++ b/doc/image-guide/ch_openstack_images.xml
@@ -303,6 +303,11 @@
             image must be configured to download the ssh public key
             from the OpenStack metadata service or config drive, at
             boot time.</para>
+        <para>If both the XenAPI agent and <package>cloud-init</package> are
+            present in an image, <package>cloud-init</package> handles ssh-key
+            injection. The system assumes <package>cloud-init</package> is
+            present when the image has the <literal>cloud_init_installed
+            </literal> property.</para>
         <simplesect>
             <title>Use <package>cloud-init</package> to fetch the
                 public key</title>