From 9a50e10b3737368776f72ccd3788d30862b85cc6 Mon Sep 17 00:00:00 2001
From: Matthew Kassawara <mkassawara@gmail.com>
Date: Mon, 20 Oct 2014 10:07:24 -0500
Subject: [PATCH] Add workaround for Ubuntu Cloud archive

I added a workaround for the Ubuntu Cloud archive repository
because the 'add-apt-repository' method does not contain
information about Juno packages.

Change-Id: Ib222dc1a1919e3e3f55e694426d25fbefb9e3cbe
Closes-Bug: #1362521
---
 doc/install-guide/section_basics-packages.xml | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/doc/install-guide/section_basics-packages.xml b/doc/install-guide/section_basics-packages.xml
index 96b18f1751..5ba5aaccb5 100644
--- a/doc/install-guide/section_basics-packages.xml
+++ b/doc/install-guide/section_basics-packages.xml
@@ -21,13 +21,6 @@
       <screen><prompt>#</prompt> <userinput>apt-get install python-software-properties</userinput></screen>
     </step>
   </procedure>
-  <procedure os="ubuntu">
-    <title>To enable the OpenStack repository</title>
-    <step>
-      <para>Enable the Ubuntu Cloud archive repository:</para>
-      <screen><prompt>#</prompt> <userinput>add-apt-repository cloud-archive:juno</userinput></screen>
-    </step>
-  </procedure>
   <procedure os="rhel;centos;fedora">
     <title>To configure prerequisites</title>
     <step>
@@ -45,6 +38,19 @@
       </note>
     </step>
   </procedure>
+  <procedure os="ubuntu">
+    <title>To enable the OpenStack repository</title>
+    <step>
+      <para>Create and edit the
+        <filename>/etc/apt/sources.list.d/ubuntu-cloud-archive-juno-trusty.list</filename>
+        file and add the following to it:</para>
+      <programlisting language="ini">deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/juno main</programlisting>
+    </step>
+    <step>
+      <para>Install the Ubuntu Cloud archive repository keyring:</para>
+      <screen><prompt>#</prompt> <userinput>apt-get install ubuntu-cloud-keyring</userinput></screen>
+    </step>
+  </procedure>
   <procedure os="rhel;centos;fedora">
     <title>To enable the OpenStack repository</title>
     <step>