BZ1559224, update downgrade docs

admin_guide/backup_restore.adoc

@@ -258,7 +258,7 @@ and displays {product-title}'s configuration:
 When using an external etcd host, you must first restore the etcd backup
 by creating a new, single node etcd cluster. If using external etcd with
 multiple members, you must then also add any additional etcd members to the
-cluster one by one.
+cluster one by one
 
 Choose a system to be the initial etcd member, and restore its etcd backup and
 configuration:
@@ -268,7 +268,7 @@ configuration:
 ----
 # ETCD_DIR=/var/lib/etcd/
 # mv $ETCD_DIR /var/lib/etcd.orig
-# cp -Rp /var/lib/origin/etcd-backup-<timestamp>/ $ETCD_DIR
+# cp -Rp var/lib/etcd.orig/openshift-backup-pre-upgrade/ $ETCD_DIR
 # chcon -R --reference /var/lib/etcd.orig/ $ETCD_DIR
 # chown -R etcd:etcd $ETCD_DIR
 ----

upgrading/downgrade.adoc

@@ -21,6 +21,14 @@ version. The following sections outline the required steps for each system in a
 cluster to perform such a downgrade for the {product-title} 3.9 to 3.7 downgrade
 path.
 
+[NOTE]
+====
+You can downgrade directly from 3.9 to 3.7, but you must restore from the etcd
+backup.
+
+If the upgrade failed at the 3.8 step, then the same downgrade procedures apply.
+====
+
 [WARNING]
 ====
 These steps are currently only supported for
@@ -52,18 +60,20 @@ which have the node component on them) with a timestamp:
 When using an external etcd cluster, the backup is created on all etcd
 members, though only one is required for the recovery process.
 
-The RPM downgrade process in a later step should create *_.rpmsave_* backups of
-the following files, but it may be a good idea to keep a separate copy
-regardless:
+Keep a copy of the *_.rpmsave_* backups of the following files:
 
 ----
-/etc/sysconfig/atomic-openshift-master
 /etc/sysconfig/atomic-openshift-master-api
 /etc/sysconfig/atomic-openshift-master-controller
 /etc/etcd/etcd.conf <1>
 ----
 <1> Only required if using external etcd.
 
+[NOTE]
+====
+Restore from the first pre-upgrade backup taken on the day of the upgrade.
+====
+
 [[downgrade-shutting-down-the-cluster]]
 == Shutting Down the Cluster
 
@@ -89,16 +99,10 @@ On any external etcd hosts:
 [[downgrade-removing-rpms]]
 == Removing RPMs
 
-. The **-excluder* packages add entries to the exclude directive in the host’s
-*_/etc/yum.conf_* file when installed. Run the following command on each host to
-remove the `atomic-openshift-*` and `docker` packages from the exclude list:
-+
-----
-# atomic-openshift-excluder unexclude
-# atomic-openshift-docker-excluder unexclude
-----
+The **-excluder* packages add entries to the exclude directive in the host’s
+*_/etc/yum.conf_* file when installed.
 
-. On all masters, nodes, and etcd members (if using an external etcd cluster),
+. On all masters, nodes, and etcd members (if using a dedicated etcd cluster),
 remove the following packages:
 +
 ----
@@ -119,9 +123,6 @@ remove the following packages:
 ----
 # yum remove etcd
 ----
-+
-If using the embedded etcd, leave the *etcd* package installed. It is required
-for running the `etcdctl` command to issue operations in later steps.
 
 [[downgrade-docker]]
 == Downgrading Docker
@@ -141,7 +142,7 @@ The following commands are destructive and should be used with caution.
 Delete all containers:
 +
 ----
-# docker rm $(docker ps -a -q)
+# docker rm $(docker ps -a -q) -f
 ----
 +
 Delete all images:
@@ -153,7 +154,7 @@ Delete all images:
 . Use `yum swap` (instead of `yum downgrade`) to install Docker 1.12.6:
 +
 ----
-# yum swap docker-* docker-*1.12.6
+# yum swap docker-* docker-*1.12.6 -y
 # sed -i 's/--storage-opt dm.use_deferred_deletion=true//' /etc/sysconfig/docker-storage
 # systemctl restart docker
 ----