openstack/openstack-manuals
Code Issues Proposed changes

Make Juno-Trunk relationship clearer

Browse Source 
Recently we've had some people trying to install Icehouse with
the Trunk guide. This no longer works.

In this patch, changes are made which will deliberately break the guide
by changing the package repositories to Juno versions that do not exist
yet.

The hope is that this will encourage people to seek out the most appropriate
guide for them - likely icehouse.

Change-Id: I42393f466c910e1d2cb350134efa815184c66902
This commit is contained in:
Tom Fifield
2014-06-20 14:40:06 +08:00
parent 3b0b13cc28
commit 7208a23e3d
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/install-guide/ch_basics.xml
View File

@@ -7,8 +7,8 @@
<note>
<para>
The trunk version of this guide focuses on the future Juno
release and may not work for the current Icehouse release. If
you want to install Icehouse, please use the <link
release and will not work for the current Icehouse release. If
you want to install Icehouse, you must use the <link
xlink:href="http://docs.openstack.org">Icehouse version</link>
of this guide instead.
</para>

30
doc/install-guide/section_basics-packages.xml
View File

@@ -23,9 +23,9 @@
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>yum install yum-plugin-priorities</userinput></screen>
<para os="fedora;centos;rhel">
To enable the RDO repository, download and
install the <package>rdo-release-icehouse</package>
install the <package>rdo-release-juno</package>
package:</para>
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>yum install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-3.noarch.rpm</userinput></screen>
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>yum install http://repos.fedorapeople.org/repos/openstack/openstack-juno/rdo-release-juno-1.noarch.rpm</userinput></screen>
<para os="fedora;centos;rhel">The EPEL package includes GPG keys
for package signing and repository information. This should only
be installed on Red Hat Enterprise Linux and CentOS, not Fedora.
@@ -43,13 +43,13 @@
access the RDO repository:</para>
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>yum install openstack-utils</userinput></screen>
<para os="opensuse;sles">Use the Open Build Service repositories
for <glossterm>Icehouse</glossterm> based on your openSUSE or
for <glossterm>Juno</glossterm> based on your openSUSE or
SUSE Linux Enterprise Server version.</para>
<para os="opensuse">For openSUSE 13.1 use:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Icehouse/openSUSE_13.1 Icehouse</userinput></screen>
<screen os="opensuse"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Juno/openSUSE_13.1 Juno</userinput></screen>
<para os="sles">If you use SUSE Linux Enterprise Server 11 SP3,
use:</para>
<screen os="sles"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Icehouse/SLE_11_SP3 Icehouse</userinput></screen>
<screen os="sles"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Juno/SLE_11_SP3 Juno</userinput></screen>
<para os="opensuse;sles">The packages are signed by GPG key 893A90DAD85F9316. You should verify the fingerprint of the imported GPG key before using it.
<programlisting>Key ID: 893A90DAD85F9316
Key Name: Cloud:OpenStack OBS Project &lt;Cloud:OpenStack@build.opensuse.org&gt;
@@ -91,19 +91,17 @@ Key Expires: Thu Dec 17 13:34:21 2015</programlisting>
kernel package, reboot the system to ensure the new kernel is running:</para>
<screen os="fedora;centos;rhel;opensuse;sles"><prompt>#</prompt> <userinput>reboot</userinput></screen>
<procedure xml:id="ubuntu-cloud-archive" os="ubuntu">
<title>To use the Ubuntu Cloud Archive for Icehouse</title>
<title>To use the Ubuntu Cloud Archive for Juno</title>
<para>The <link
xlink:href="https://wiki.ubuntu.com/ServerTeam/CloudArchive"
>Ubuntu Cloud Archive</link> is a special repository that
allows you to install newer releases of OpenStack on the
stable supported version of Ubuntu.</para>
<note><para>Icehouse is in the main repository for 14.04 -
this step is not required.</para></note>
<step>
<para>Install the Ubuntu Cloud Archive for
<glossterm>Icehouse</glossterm>:
<glossterm>Juno</glossterm>:
<screen><prompt>#</prompt> <userinput>apt-get install python-software-properties</userinput>
<prompt>#</prompt> <userinput>add-apt-repository cloud-archive:icehouse</userinput></screen></para>
<prompt>#</prompt> <userinput>add-apt-repository cloud-archive:juno</userinput></screen></para>
</step>
<step>
<para>Update the package database and upgrade your system:</para>
@@ -125,21 +123,21 @@ Key Expires: Thu Dec 17 13:34:21 2015</programlisting>
</procedure>
<procedure xml:id="debian-cloud-archive" os="debian">
<title>To use the Debian Wheezy backports archive for
Icehouse</title>
<para>The <glossterm>Icehouse</glossterm> release is available
Juno</title>
<para>The <glossterm>Juno</glossterm> release is available
only in Debian Sid
(otherwise called Unstable). However, the Debian maintainers
of OpenStack also maintain a non-official Debian repository
for OpenStack containing Wheezy backports.</para>
<step>
<para>Install the Debian Wheezy backport repository
Icehouse:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian icehouse-backports main" >>/etc/apt/sources.list</userinput></screen>
Juno:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian juno-backports main" >>/etc/apt/sources.list</userinput></screen>
</step>
<step>
<para>Install the Debian Wheezy OpenStack repository for
Icehouse:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian icehouse main" >>/etc/apt/sources.list</userinput></screen>
Juno:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian juno main" >>/etc/apt/sources.list</userinput></screen>
</step>
<step>
<para>Update the repository database and install the key:</para>