From fbe43ecaab22fb59f834cf9677af64360c94fda2 Mon Sep 17 00:00:00 2001
From: Stephen Gordon <sgordon@redhat.com>
Date: Tue, 2 Jul 2013 13:41:10 -0400
Subject: [PATCH] Bug # 1197054 - Added new official fedora cloud image link.

Fedora now includes 'official' cloud images, rather than the
unofficial ones provided in earlier releases. As such I have
updated the relevant paragraph to link to these.

Conflicts:
	doc/src/docbkx/openstack-image/ch_obtaining_images.xml

Cherry picked from http://review.openstack.org/35341

Change-Id: Ia5f5ceffb206431262396d58ac1e1f4973c01a68
---
 .../openstack-image/ch_obtaining_images.xml    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/src/docbkx/openstack-image/ch_obtaining_images.xml b/doc/src/docbkx/openstack-image/ch_obtaining_images.xml
index 7978cef002..85e552d9be 100644
--- a/doc/src/docbkx/openstack-image/ch_obtaining_images.xml
+++ b/doc/src/docbkx/openstack-image/ch_obtaining_images.xml
@@ -59,6 +59,15 @@
               for kickstarting operating system installation over a network.
             </para>
         </section>
+    <section xml:id="fedora-images">
+        <title>Official Fedora images</title>
+        <para>The Fedora project maintains a list of official cloud images at
+              <link xlink:href="http://cloud.fedoraproject.org/" />. The images
+              include the <systemitem class="process">cloud-init</systemitem>
+              utility to support key and user data injection. The default user
+              name is <systemitem class="username">fedora</systemitem>.
+        </para>
+    </section>
     <section xml:id="suse-sles-images">
         <title>Official openSUSE and SLES images</title>
         <para>SUSE does not provide openSUSE or SUSE Linux Enterprise
@@ -73,15 +82,8 @@
     </section>
     <section xml:id="other-distros">
         <title>Official images from other Linux distributions</title>
-        <para>As of this writing, we are not aware of any distributions other than Ubuntu and
-            openSUSE/SLES that provide images for download.</para>
+        <para>As of this writing, we are not aware of other distributions that provide images for download.</para>
     </section>
-    <section xml:id="fedora-images">
-            <title>Unofficial Fedora images</title>
-        <para>Daniel Berrangé from Red Hat hosts some downloadable qcow2 Fedora images at <link
-                xlink:href="http://berrange.fedorapeople.org/images"
-                >http://berrange.fedorapeople.org/images</link>.</para>
-        </section>
         <section xml:id="rcb-images">
             <title>Rackspace Cloud Builders (multiple distros)
                 images</title>