Skip to content

Commit

Permalink
Replace all references of Cloud3/4 with Cloud4/5
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.suse.de/svn/doc/trunk/cloud/en@59509 2463f871-af05-0410-bd21-ebfa852e3ce4
  • Loading branch information
Dirk Mueller committed Sep 8, 2014
1 parent 72c7fd3 commit 54798b0
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 41 deletions.
38 changes: 19 additions & 19 deletions xml/depl_inst_admin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ title="Profiling step"?>
to have registered both products in &ncc;. Run the following commands as
user &rootuser; on the ⪪ server:
</para>
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-4-{Pool,Updates}; do
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-5-{Pool,Updates}; do
smt-repos $REPO sle-11-x86_64 -e
done
smt-mirror -L /var/log/smt/smt-mirror.log</screen>
Expand Down Expand Up @@ -831,24 +831,24 @@ smt-mirror -L /var/log/smt/smt-mirror_ha.log</screen>
<row>
<entry>
<para>
SUSE-Cloud-4-Pool
SUSE-Cloud-5-Pool
</para>
</entry>
<entry>
<para>
<filename>/srv/www/htdocs/repo/$RCE/SUSE-Cloud-4-Pool/sle-11-x86_64</filename>
<filename>/srv/www/htdocs/repo/$RCE/SUSE-Cloud-5-Pool/sle-11-x86_64</filename>
</para>
</entry>
</row>
<row>
<entry>
<para>
SUSE-Cloud-4-Updates
SUSE-Cloud-5-Updates
</para>
</entry>
<entry>
<para>
<filename>/srv/www/htdocs/repo/$RCE/SUSE-Cloud-4-Updates/sle-11-x86_64</filename>
<filename>/srv/www/htdocs/repo/$RCE/SUSE-Cloud-5-Updates/sle-11-x86_64</filename>
</para>
</entry>
</row>
Expand Down Expand Up @@ -982,7 +982,7 @@ smt-mirror -L /var/log/smt/smt-mirror_ha.log</screen>
<row>
<entry>
<para>
Cloud 4 Product
Cloud 5 Product
</para>
</entry>
<entry>
Expand Down Expand Up @@ -1051,7 +1051,7 @@ mount -t nfs <replaceable>nfs.&exampledomain;:/exports/SUSE-CLOU/DVD1/</replacea
images of DVD1 to the &admserv; and mounting them:
</para>
<screen>mount -o loop <replaceable>/local/SLES-11-SP3-DVD-x86_64-DVD1.iso</replaceable> /srv/tftpboot/suse-11.3/install
mount -o loop <replaceable>/local/SUSE-CLOUD-4-DVD1.iso</replaceable> /srv/tftpboot/repos/Cloud</screen>
mount -o loop <replaceable>/local/SUSE-CLOUD-5-DVD1.iso</replaceable> /srv/tftpboot/repos/Cloud</screen>
<para>
To automatically mount these directories either create entries in
<filename>/etc/fstab</filename> or set up the automounter.
Expand Down Expand Up @@ -1118,24 +1118,24 @@ mount -o loop <replaceable>/local/SUSE-CLOUD-4-DVD1.iso</replaceable> /srv/tftpb
<row>
<entry>
<para>
SUSE-Cloud-4-Pool
SUSE-Cloud-5-Pool
</para>
</entry>
<entry>
<para>
<filename>/srv/tftpboot/repos/SUSE-Cloud-4-Pool</filename>
<filename>/srv/tftpboot/repos/SUSE-Cloud-5-Pool</filename>
</para>
</entry>
</row>
<row>
<entry>
<para>
SUSE-Cloud-4-Updates
SUSE-Cloud-5-Updates
</para>
</entry>
<entry>
<para>
<filename>/srv/tftpboot/repos/SUSE-Cloud-4-Updates</filename>
<filename>/srv/tftpboot/repos/SUSE-Cloud-5-Updates</filename>
</para>
</entry>
</row>
Expand Down Expand Up @@ -1209,7 +1209,7 @@ mount -o loop <replaceable>/local/SUSE-CLOUD-4-DVD1.iso</replaceable> /srv/tftpb
<para>
In order to use repositories from a remote &smt; server to deploy
&cloud; you first need to make sure the products &sls; 11 SP3 and
Cloud 4 are registered and the corresponding channels are mirrored
Cloud 5 are registered and the corresponding channels are mirrored
in &smt;. Now you need to enter the repository URLs on the
<guimenu>Repositories</guimenu> tab in the &yast; &crow; module as
described in <xref
Expand All @@ -1221,8 +1221,8 @@ mount -o loop <replaceable>/local/SUSE-CLOUD-4-DVD1.iso</replaceable> /srv/tftpb
<simplelist>
<member>http://<replaceable>smt.&exampledomain;</replaceable>/repo/\$RCE/SLES11-SP3-Pool/sle-11-x86_64/</member>
<member>http://<replaceable>smt.&exampledomain;</replaceable>/repo/\$RCE/SLES11-SP3-Updates/sle-11-x86_64/</member>
<member>http://<replaceable>smt.&exampledomain;</replaceable>/repo/\$RCE/SUSE-Cloud-4-Pool/sle-11-x86_64/</member>
<member>http://<replaceable>smt.&exampledomain;</replaceable>/repo/\$RCE/SUSE-Cloud-4-Updates/sle-11-x86_64/</member>
<member>http://<replaceable>smt.&exampledomain;</replaceable>/repo/\$RCE/SUSE-Cloud-5-Pool/sle-11-x86_64/</member>
<member>http://<replaceable>smt.&exampledomain;</replaceable>/repo/\$RCE/SUSE-Cloud-5-Updates/sle-11-x86_64/</member>
</simplelist>
<para>
For the optional &hasetup; you also need the &ha; repositories:
Expand Down Expand Up @@ -1251,7 +1251,7 @@ mount -o loop <replaceable>/local/SUSE-CLOUD-4-DVD1.iso</replaceable> /srv/tftpb
Link the repositories mirrored by &smt; to
<filename>/srv/tftpboot</filename>:
</para>
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-4-{Pool,Updates}; do
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-5-{Pool,Updates}; do
ln -s /srv/www/htdocs/repo/\$RCE/$REPO/sle-11-x86_64 /srv/tftpboot/repos/${REPO}
done</screen>
<para>
Expand Down Expand Up @@ -1309,15 +1309,15 @@ done</screen>
</listitem>
</varlistentry>
<varlistentry>
<term>SUSE-Cloud-4-Pool</term>
<term>SUSE-Cloud-5-Pool</term>
<listitem>
<para>
<literal>http://manager.&exampledomain;/ks/dist/child/suse-cloud-4-pool-x86_64/sles11-sp3-x86_64/</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>SUSE-Cloud-4-Updates</term>
<term>SUSE-Cloud-5-Updates</term>
<listitem>
<para>
<literal>http://manager.&exampledomain;/ks/dist/child/suse-cloud-4-updates-x86_64/sles11-sp3-x86_64/</literal>
Expand Down Expand Up @@ -1386,7 +1386,7 @@ done</screen>
&admserv;. This command will <emphasis>pull</emphasis> the files from
a host named host.&exampledomain;:
</para>
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-4-{Pool,Updates}; do
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-5-{Pool,Updates}; do
rsync -avPz host.&exampledomain;:/srv/www/htdocs/repo/\\\$RCE/$REPO/sle-11-x86_64/ \
/srv/tftpboot/repos/${REPO}/
done</screen>
Expand All @@ -1403,7 +1403,7 @@ done</screen>
address <systemitem class="etheraddress">192.168.124.10</systemitem>
in the following example):
</para>
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-4-{Pool,Updates}; do
<screen><?dbsuse-fo font-size="0.63em"?>for REPO in SLES11-SP3-{Pool,Updates} SUSE-Cloud-5-{Pool,Updates}; do
rsync -avPz /srv/www/htdocs/repo/\\\$RCE/$REPO/sle-11-x86_64/ \
<replaceable>192.168.124.10</replaceable>:/srv/tftpboot/repos/${REPO}/
done</screen>
Expand Down
4 changes: 2 additions & 2 deletions xml/depl_inst_nodes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -660,8 +660,8 @@ title="Profiling step"?>
</para>
<para>
To enable the &susemgr; server to manage the &cloud; nodes, the
respective &productname; &productnumber; channels (SUSE-Cloud-4-Pool,
SUSE-Cloud-4-Updates) need to be available on the server. It also
respective &productname; &productnumber; channels (SUSE-Cloud-5-Pool,
SUSE-Cloud-5-Updates) need to be available on the server. It also
requires to generate an <literal>Activation Key</literal> for &cloud;.
</para>
<para>
Expand Down
36 changes: 18 additions & 18 deletions xml/depl_maintenance.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@
</variablelist>
</sect1>
<sect1 id="sec.depl.maintenance.upgrade">
<title>Upgrading from &productname; 3 to &productname; 4</title>
<title>Upgrading from &productname; 5 to &productname; 5</title>

<para>
Upgrading from &productname; 3 to &productname; 4 is supported, with the
Upgrading from &productname; 4 to &productname; 5 is supported, with the
following manual steps. However, note that it will turn off the
&ostack; cloud during the upgrade and it is not possible to downgrade back
to &productname; 3 in case of a regression or problem. It is highly
Expand Down Expand Up @@ -155,32 +155,32 @@
Upgrade
</title>
<para>
As of &productname; 4, HyperV Nodes need to be re-installed after the
As of &productname; 5, HyperV Nodes need to be re-installed after the
upgrade procedure. This re-installation will overwrite the instance's data
and therefore they will be lost. &kvm;, VMWare and &xen; instances are not
affected.
</para>
</important>

<procedure>
<title> Upgrading &productname; 3 to 4</title>
<title> Upgrading &productname; 4 to 5</title>
<step>
<para>
Make sure to subscribe to the SUSE Cloud 4 Pool and Update channels on
Make sure to subscribe to the SUSE Cloud 5 Pool and Update channels on
the source that provides these channels for your &cloud; installation
(for example an &smt; or &susemgr; server).
</para>
<para>
In case the channels are provided by an &smt; server (either remote or on
the &admserv; itself), refer to <xref
linkend="sec.depl.inst.admserv.post.smt_repos"/> for instructions on
subscribing to the &cloud; 4 channels.
subscribing to the &cloud; 5 channels.
</para>
</step>
<step>
<para>
Update the &productname; product repository on the &admserv;. To do so,
insert the &productname; 4 DVD and run the following commands:
insert the &productname; 5 DVD and run the following commands:
</para>
<screen>mount /dev/dvd /mnt
rsync -avP --delete /mnt/ /srv/tftpboot/repos/Cloud/
Expand All @@ -192,28 +192,28 @@ umount /mnt</screen>
</para>
<para>
If you are using external URLs (for example from an external &smt; or
&susemgr; server) for the SUSE Cloud 3 Pool and Update repositories,
&susemgr; server) for the SUSE Cloud 4 Pool and Update repositories,
you need to update the file
<filename>/etc/crowbar/provisioner.json</filename>. Open it in an editor
and Search for the <menuchoice> <guimenu>suse</guimenu>
<guimenu>autoyast</guimenu> <guimenu>repos</guimenu></menuchoice>
entry. Replace the URLs pointing to the &productname; 3 Pool and Update
repositories with the ones pointing to version 4. Also change the name of
these repositories to SUSE-Cloud-4-Pool and SUSE-Cloud-4-Updates,
entry. Replace the URLs pointing to the &productname; 4 Pool and Update
repositories with the ones pointing to version 5. Also change the name of
these repositories to SUSE-Cloud-5-Pool and SUSE-Cloud-5-Updates,
respectively.
</para>
<para>
In case you are using an &smt; server installed on the &admserv;, run the
following commands to make the repositories available for &cloud;:
</para>
<screen>for REPO in SUSE-Cloud-4-{Pool,Updates}; do
<screen>for REPO in SUSE-Cloud-5-{Pool,Updates}; do
ln -s /srv/www/htdocs/repo/\$RCE/$REPO/sle-11-x86_64 /srv/tftpboot/repos/${REPO}
done</screen>
</step>
<step>
<para>
Now you need to replace the &productname; 3 Pool and Update
repositories used by the &admserv; with the ones for version 4. Modify
Now you need to replace the &productname; 4 Pool and Update
repositories used by the &admserv; with the ones for version 5. Modify
the repository configuration by running <menuchoice>
<guimenu>&yast;</guimenu> <guimenu>Software</guimenu> <guimenu>Software
Repositories</guimenu></menuchoice> on the &admserv;.
Expand All @@ -235,14 +235,14 @@ zypper install suse-cloud-upgrade</screen>
Web interface. In case the command fails, contact the &suse;
support (see <xref linkend="sec.depl.trouble.support"/> for more
information). At this point of the upgrade workflow it is still possible
to go back to version 3.
to go back to version 4.
</para>
</step>
<step>
<para>
Update all packages on the &admserv; by running <command>zypper
<option>up</option></command>. During the update process you will need to
accept the &productname; 4 EULA.
accept the &productname; 5 EULA.
</para>
</step>
<step>
Expand All @@ -252,7 +252,7 @@ zypper install suse-cloud-upgrade</screen>
the command fails, contact the &suse; support (see <xref
linkend="sec.depl.trouble.support"/> for more information). From this
point in the installation workflow on it is no longer possible to go back
to version 3.
to version 4.
</para>
</step>
<step>
Expand Down Expand Up @@ -491,7 +491,7 @@ done</screen>
<title>Backing Up and Restoring the &admserv;</title>
<para>As an example of how to back up and restore the data on the
&admserv;, a <filename>crowbar-backup</filename> script is shipped with
&productname; 4. </para>
&productname; 5. </para>
<warning>
<title>No Support for <filename>crowbar-backup</filename></title>
<para>The script serves as a functioning <emphasis>example</emphasis> of how
Expand Down
4 changes: 2 additions & 2 deletions xml/depl_require.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@
</listitem>
</varlistentry>
<varlistentry>
<term>SLES11-SP3-Pool and SUSE-Cloud-4-Pool</term>
<term>SLES11-SP3-Pool and SUSE-Cloud-5-Pool</term>
<listitem>
<para>
The &sls; and &productname; repositories containing all binary RPMs from
Expand All @@ -830,7 +830,7 @@
</listitem>
</varlistentry>
<varlistentry>
<term>SLES11-SP3-Updates and SUSE-Cloud-4-Updates</term>
<term>SLES11-SP3-Updates and SUSE-Cloud-5-Updates</term>
<listitem>
<para>
These repositories contain maintenance updates to packages in the
Expand Down

0 comments on commit 54798b0

Please sign in to comment.