openstack/openstack-manuals
Code Issues Proposed changes

Trunk install guide is now icehouse!

Browse Source 
This change updates package lists to be icehouse, rather than
havana. Some of these work, others do not. All will be worked
out during https://wiki.openstack.org/wiki/IcehouseDocTesting

Removes a havana-specific paragraph for OpenSUSE

Change-Id: I59cab2d83695923e6b10ca60cdcf7a7fab55026e
This commit is contained in:
Tom Fifield 2014-02-27 10:41:27 +08:00
parent 0465b9ce3e
commit 67d0d6a542
3 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/install-guide/bk_openstackinstallguide.xml
View File

@ -37,7 +37,7 @@
<year>2013</year>
<holder>OpenStack Foundation</holder>
</copyright>
<releaseinfo>havana</releaseinfo>
<releaseinfo>icehouse</releaseinfo>
<productname>OpenStack Installation Guide</productname>
<pubdate/>
<legalnotice role="apache2">

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

@ -467,10 +467,10 @@ bind-address = 192.168.0.10</programlisting>
<para os="fedora;centos;rhel">The examples in this guide use the
OpenStack packages from the RDO repository. These packages work
on Red Hat Enterprise Linux 6, compatible versions of CentOS,
and Fedora 19. To enable the RDO repository, download and
install the <package>rdo-release-havana</package>
and Fedora 20. To enable the RDO repository, download and
install the <package>rdo-release-icehouse</package>
package.</para>
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>yum install http://repos.fedorapeople.org/repos/openstack/openstack-havana/rdo-release-havana-6.noarch.rpm</userinput></screen>
<screen os="fedora;centos;rhel"><prompt>#</prompt> <userinput>yum install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-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.
@ -488,20 +488,15 @@ bind-address = 192.168.0.10</programlisting>
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>Havana</glossterm> based on your openSUSE or
for <glossterm>Icehouse</glossterm> based on your openSUSE or
SUSE Linux Enterprise
Server version, for example if you run openSUSE 12.3 use:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Havana/openSUSE_12.3 Havana</userinput></screen>
<screen os="opensuse"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Icehouse/openSUSE_12.3 Icehouse</userinput></screen>
<para os="opensuse">For openSUSE 13.1 use:</para>
<screen os="opensuse"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Havana/openSUSE_13.1 Havana</userinput></screen>
<screen os="opensuse"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Icehouse/openSUSE_13.1 Icehouse</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:Havana/SLE_11_SP3 Havana</userinput></screen>
<para os="opensuse">
While openSUSE 13.1 contains OpenStack Havana packages, these
instructions apply also to 13.1. The Open Build Service contains
updated OpenStack packages with important fixes.
</para>
<screen os="sles"><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Icehouse/SLE_11_SP3 Icehouse</userinput></screen>
<para os="opensuse;sles">The <package>openstack-utils</package>
package contains utility programs that make installation and
configuration easier. These programs are used throughout this
@ -535,7 +530,7 @@ bind-address = 192.168.0.10</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 Havana</title>
<title>To use the Ubuntu Cloud Archive for Icehouse</title>
<para>The <link
xlink:href="https://wiki.ubuntu.com/ServerTeam/CloudArchive"
>Ubuntu Cloud Archive</link> is a special repository that
@ -543,9 +538,9 @@ bind-address = 192.168.0.10</programlisting>
stable supported version of Ubuntu.</para>
<step>
<para>Install the Ubuntu Cloud Archive for
<glossterm>Havana</glossterm>:
<glossterm>Icehouse</glossterm>:
<screen><prompt>#</prompt> <userinput>apt-get install python-software-properties</userinput>
<prompt>#</prompt> <userinput>add-apt-repository cloud-archive:havana</userinput></screen></para>
<prompt>#</prompt> <userinput>add-apt-repository cloud-archive:icehouse</userinput></screen></para>
</step>
<step>
<para>Update the package database, upgrade your system, and reboot
@ -556,21 +551,21 @@ bind-address = 192.168.0.10</programlisting>
</procedure>
<procedure xml:id="debian-cloud-archive" os="debian">
<title>To use the Debian Wheezy backports archive for
Havana</title>
<para>The <glossterm>Havana</glossterm> release is available
Icehouse</title>
<para>The <glossterm>Icehouse</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
Havana:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian havana-backports main" >>/etc/apt/sources.list</userinput></screen>
Icehouse:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian icehouse-backports main" >>/etc/apt/sources.list</userinput></screen>
</step>
<step>
<para>Install the Debian Wheezy OpenStack repository for
Havana:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian havana main" >>/etc/apt/sources.list</userinput></screen>
Icehouse:</para>
<screen><prompt>#</prompt> <userinput>echo "deb http://archive.gplhost.com/debian icehouse main" >>/etc/apt/sources.list</userinput></screen>
</step>
<step>
<para>Update the repository database and install the key:</para>

2
doc/install-guide/ch_neutron.xml
View File

@ -18,7 +18,7 @@
focuses on the Open vSwitch driver. However, the theories
presented here are mostly applicable to other mechanisms,
and the <link
xlink:href="http://docs.openstack.org/havana/config-reference/content/ch_configuring-openstack-networking.html"
xlink:href="http://docs.openstack.org/trunk/config-reference/content/ch_configuring-openstack-networking.html"
>Networking</link> chapter
of the <citetitle>OpenStack Configuration Reference</citetitle>
offers additional information.</para>