From 7208a23e3d6f1062c97583dea7c089c14fb2ffe1 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Fri, 20 Jun 2014 14:40:06 +0800 Subject: [PATCH] Make Juno-Trunk relationship clearer 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 --- doc/install-guide/ch_basics.xml | 4 +-- doc/install-guide/section_basics-packages.xml | 30 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/doc/install-guide/ch_basics.xml b/doc/install-guide/ch_basics.xml index cdf90531f2..126f66c34b 100644 --- a/doc/install-guide/ch_basics.xml +++ b/doc/install-guide/ch_basics.xml @@ -7,8 +7,8 @@ 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 Icehouse version of this guide instead. diff --git a/doc/install-guide/section_basics-packages.xml b/doc/install-guide/section_basics-packages.xml index 469edb3057..5c6d9714b5 100644 --- a/doc/install-guide/section_basics-packages.xml +++ b/doc/install-guide/section_basics-packages.xml @@ -23,9 +23,9 @@ # yum install yum-plugin-priorities To enable the RDO repository, download and - install the rdo-release-icehouse + install the rdo-release-juno package: - # yum install http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-3.noarch.rpm + # yum install http://repos.fedorapeople.org/repos/openstack/openstack-juno/rdo-release-juno-1.noarch.rpm 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: # yum install openstack-utils Use the Open Build Service repositories - for Icehouse based on your openSUSE or + for Juno based on your openSUSE or SUSE Linux Enterprise Server version. For openSUSE 13.1 use: - # zypper addrepo -f obs://Cloud:OpenStack:Icehouse/openSUSE_13.1 Icehouse + # zypper addrepo -f obs://Cloud:OpenStack:Juno/openSUSE_13.1 Juno If you use SUSE Linux Enterprise Server 11 SP3, use: - # zypper addrepo -f obs://Cloud:OpenStack:Icehouse/SLE_11_SP3 Icehouse + # zypper addrepo -f obs://Cloud:OpenStack:Juno/SLE_11_SP3 Juno The packages are signed by GPG key 893A90DAD85F9316. You should verify the fingerprint of the imported GPG key before using it. Key ID: 893A90DAD85F9316 Key Name: Cloud:OpenStack OBS Project <Cloud:OpenStack@build.opensuse.org> @@ -91,19 +91,17 @@ Key Expires: Thu Dec 17 13:34:21 2015 kernel package, reboot the system to ensure the new kernel is running: # reboot - To use the Ubuntu Cloud Archive for Icehouse + To use the Ubuntu Cloud Archive for Juno The Ubuntu Cloud Archive is a special repository that allows you to install newer releases of OpenStack on the stable supported version of Ubuntu. - Icehouse is in the main repository for 14.04 - - this step is not required. Install the Ubuntu Cloud Archive for - Icehouse: + Juno: # apt-get install python-software-properties -# add-apt-repository cloud-archive:icehouse +# add-apt-repository cloud-archive:juno Update the package database and upgrade your system: @@ -125,21 +123,21 @@ Key Expires: Thu Dec 17 13:34:21 2015 To use the Debian Wheezy backports archive for - Icehouse - The Icehouse release is available + Juno + The Juno 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. Install the Debian Wheezy backport repository - Icehouse: - # echo "deb http://archive.gplhost.com/debian icehouse-backports main" >>/etc/apt/sources.list + Juno: + # echo "deb http://archive.gplhost.com/debian juno-backports main" >>/etc/apt/sources.list Install the Debian Wheezy OpenStack repository for - Icehouse: - # echo "deb http://archive.gplhost.com/debian icehouse main" >>/etc/apt/sources.list + Juno: + # echo "deb http://archive.gplhost.com/debian juno main" >>/etc/apt/sources.list Update the repository database and install the key: