Bug 1135324

Since this issue was entered in Red Hat Bugzilla, the release flag has been
set to ? to ensure that it is properly evaluated for this release.

Adding to list of 6.1 sections :)

Redirecting to stbenjam as he has probably more fresh info than I do

Hi,

The upgrade instructions for upstream will be very similar for Satellite 6.1:
  http://www.katello.org/docs/2.1/upgrade/index.html

I will leave the needinfo as there may be further instructions for upgrade to isolated capsule.

Upgrade step for Discovery plugin:

In the Satellite 6 user interface, go to Provisioning Templates, edit the PXELinux global default template and modify the discovery menu entry:

LABEL discovery
MENU LABEL Foreman Discovery
MENU DEFAULT
KERNEL /var/lib/tftpboot/boot/fdi-image-rhel_7-vmlinuz
APPEND initrd=boot/fdi-image-rhel_7-img rootflags=loop root=live:/fdi.iso rootfstype=auto ro rd.live.image acpi=force rd.luks=0 rd.md=0 rd.dm=0 rd.lvm=0 rd.bootif=0 rd.neednet=0 nomodeset proxy.url=https://SATELLITE_CAPSULE_URL proxy.type=proxy
IPAPPEND 2

The proxy.type option can be either proxy or foreman. In the first case all communication goes through Satellite Capsule, in the latter case the communication goes directly to Satellite Server (behavior of Satellite 6.0 release).

The proxy.url specifies URL of the Satellite Capsule or Server depending on the previous setting. Both http and https schemes are supported.

On the TFTP Satellite Capsule, install the following package which has been added in Satellite 6.1 if you plan to leverage Capsule as a proxy for discovered hosts (so no direct connection to Satellite Server is required):

yum install rubygem-smart_proxy_discovery.noarch

Check if foreman_url setting is present on the Capsule pointing to the Satellite Server correctly:

grep foreman_url /etc/foreman-proxy/settings.yml 
:foreman_url: https://fqdn.of.satellite.server.host

Then restart the foreman-proxy component on the Satellite Capsule server:

service foreman-proxy restart

Upgrade foreman-discovery-image package on the Satellite Server and reboot all discovered nodes via Satellite user interface or CLI.

Since this issue was entered in Red Hat Bugzilla, the release flag has been
set to ? to ensure that it is properly evaluated for this release.

Stephen,
Can I get you to go over this? I'm not in any position to test upgrades, and for beta I'm quite happy to take Tahlia's edits as-is. We're supposed to be freezing all the docs for beta inside the next 24 hours.

thanks a lot

Hi David,

No problem. Overall it looks good and correct, it seems to be based off the latest version of the notes we had in the upgrade pad, so no major issues.

A few comments:


Section 7:

"The Satellite Server and Capsule Servers are upgraded independently. Upgrade the Satellite server first, and then upgrade any Capsules."

Add a note that 6.0 capsules are not compatible with 6.1, and need to be upgraded.

Section 7.2:

I would swap steps 7 & 8, as copying the answer file is needed because of the note before step 7.

Step 9 - maybe add "If this capsule will be used for discovery, "

Step 9 b, c, and d should be removed.  (b) will be fixed by the installer upgrade if its wrong, (c) is going to happen during the upgrade, and (d) was a prerequisite to begin the upgrade.

Oh one more! We should take BZ1221217 into account!

If users have made manual edits to configuration files controlled by Satellite, they should understand they will get overwritten.  There's an explanation in comment 1 of the first BZ.

The most common changes people may have made is to the DHCP and DNS configuration and might be surprised when that gets overwritten.  If they do not want this to happen, they should add these options to the --upgrade installer command:

on Katello:
--capsule-dns-managed=false --capsule-dhcp-managed=false

on Capsule:
--dns-managed=false --dhcp-managed=false

This will leave their DNS and DHCP configruations untouched forever, until they set managed=true again.

Thanks Stephen! I'll include these items in my next pass at the chapter. I'm too late for beta, but I'll have this all done for GA.

*** Bug 1227785 has been marked as a duplicate of this bug. ***

Can't verify this because there are still missing bits.

Tahlia,
We might have to get together and work this out, unless you want to review https://bugzilla.redhat.com/show_bug.cgi?id=1195842 and Lukas' etherpad notes?

Apparently a couple of bits in the Discovery upgrade need another look.

We might need to sort out what's going in the rel notes as well.

Just 2 notes, but looks otherwise accurate although a little cumbersome.


* I don't see how step 1 is possible, does 6.0.8 include /usr/bin/katello-backup?
I don't think it does. 

* Step 3, and 4.  Can you refactor this like the install guide so you show cut-and-paste commands for rhel 6 AND 7?

See: section 2.1.1, #4 http://file.bne.redhat.com/~daobrien/Satellite6.1/Installation_Guide/#sect-Red_Hat_Satellite-Installation_Guide-Downloading_from_a_Connected_Network

Sorry for the delay about the discovery stuff -

For the Discovery Upgrade in the release notes (http://file.bne.redhat.com/~daobrien/Satellite6.1/Release_Notes/#sect-Red_Hat_Satellite-Release_Notes-Product_Notes-Upgrading_the_Discovery_Feature), I think you can actually leave it as is - include it in the Capsule upgrade, but as a separate section, and you should be fine.

Re Comment 34: Step 1 is not possible but we need to work out a suitable replacement for "back up the databases". I emailed mmccune and stbenjamin about this.

Steps 3 & 4 have been refactored as requested.

Re Comment 35: the Discovery Upgrade section has been moved from the Release Notes to a separate section after "Upgrading Satellite Capsule".

Setting need_info for Stephen to work out the database backup step.

*** Bug 1195842 has been marked as a duplicate of this bug. ***

Have everything we need for now, I think. Remove need-info