Add Ubuntu 14.04 to install guide

Icehouse is in ubuntu 14.04, which is the new Long Term Support
edition, which will eventually replace 12.04.

This adds the change needed to get it to work in the packaging
section of the install guide, and updates the labels.

Change-Id: I1008ff1b578b5a09d785b8de37b4d14ea958f236
This commit is contained in:
Tom Fifield 2014-04-07 18:22:08 +08:00
parent 5238c845bf
commit e108802ae8
3 changed files with 5 additions and 3 deletions

View File

@ -8,7 +8,7 @@
<title>OpenStack Installation Guide<phrase os="rhel;centos;fedora"
> for Red Hat Enterprise Linux, CentOS, and
Fedora</phrase>
<phrase os="ubuntu"> for Ubuntu 12.04 (LTS)</phrase>
<phrase os="ubuntu"> for Ubuntu 12.04/14.04 (LTS)</phrase>
<phrase os="debian"> for Debian 7.0 (Wheezy)</phrase>
<phrase os="opensuse"> for openSUSE and SUSE Linux Enterprise
Server</phrase>
@ -17,7 +17,7 @@
<titleabbrev>OpenStack Installation Guide<phrase
os="rhel;centos;fedora"> for Red Hat Enterprise Linux,
CentOS, and Fedora</phrase>
<phrase os="ubuntu"> for Ubuntu 12.04 (LTS)</phrase>
<phrase os="ubuntu"> for Ubuntu 12.04/14.04 (LTS)</phrase>
<phrase os="opensuse"> for openSUSE and SUSE Linux Enterprise
Server</phrase>
<phrase os="debian"> for Debian 7.0 (Wheezy)</phrase>

View File

@ -83,6 +83,8 @@
>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>:

View File

@ -189,7 +189,7 @@
<dd><a
href="http://docs.openstack.org/trunk/install-guide/install/apt/content/"
>Installation Guide for Ubuntu
12.04 (LTS) Server</a></dd>
12.04/14.04 (LTS) Server</a></dd>
</dl>
<h4 class="special">Configure and run an OpenStack cloud</h4>
<dl>