More reverting of quick_install changes

Author: adellape

install_config/adding_hosts_to_existing_cluster.adoc

@@ -59,10 +59,10 @@ The recommended maximum number of nodes is 300.
 To add nodes to your installation:
 
 . Ensure you have the latest installer and playbooks by updating the
-*openshift-ansible* packages:
+*atomic-openshift-utils* package:
 +
 ----
-# yum update openshift-ansible
+# yum update atomic-openshift-utils
 ----
 
 . Run the installer with the `scaleup` subcommand in interactive or
@@ -138,11 +138,11 @@ The recommended maximum number of nodes is 300.
 
 To add a host to an existing cluster:
 
-. Ensure you have the latest playbooks by updating the *openshift-ansible*
-packages:
+. Ensure you have the latest playbooks by updating the *atomic-openshift-utils*
+package:
 +
 ----
-# yum update openshift-ansible
+# yum update atomic-openshift-utils
 ----
 
 . Edit your *_/etc/ansible/hosts_* file and add *new_<host_type>* to the
@@ -263,11 +263,11 @@ preparation] steps.
 
 To add an etcd host to an existing cluster:
 
-. Ensure you have the latest playbooks by updating the *openshift-ansible* packages:
+. Ensure you have the latest playbooks by updating the *atomic-openshift-utils* package:
 +
 [source, bash]
 ----
-$ yum update openshift-ansible
+$ yum update atomic-openshift-utils
 ----
 
 . Edit your *_/etc/ansible/hosts_* file, add *new_<host_type>* to the

install_config/upgrading/automated_upgrades.adoc

@@ -23,7 +23,7 @@ ifdef::openshift-enterprise[]
 If you installed using the
 xref:../../install_config/install/quick_install.adoc#install-config-install-quick-install[quick installation] method
 and a *_~/.config/openshift/installer.cfg.yml_* file is available, you can use
-the installer to perform the automated upgrade.
+the quick installer to perform the automated upgrade.
 endif::[]
 
 The automated upgrade performs the following steps for you:
@@ -141,14 +141,15 @@ channel and enable the 3.7 channel on each master and node host:
 ----
 
 . For any upgrade path, always ensure that you have the latest version of the
-*openshift-ansible-** packages on each RHEL 7 system
+*atomic-openshift-utils* package on each RHEL 7 system, which also updates the
+*openshift-ansible-** packages:
 +
 ----
-# yum update openshift-ansible
+# yum update atomic-openshift-utils
 ----
 
 . When installing or updating *atomic-openshift-utils*,
-*_/usr/share/openshift/examples/_* does not get updated with the latest
+*_/usr/share/openshift/examples/_*  does not get updated with the latest
 templates. To update these files:
 +
 ----
@@ -187,10 +188,49 @@ xref:../../install_config/upgrading/migrating_etcd.adoc#install-config-upgrading
 After satisfying these steps, there are two methods for running the automated
 upgrade:
 
+- xref:upgrading-using-the-installation-utility-to-upgrade[Using the quick installer]
 - xref:running-the-upgrade-playbook-directly[Running the upgrade playbook directly]
 
 Choose and follow one of these methods.
 
+[[upgrading-using-the-installation-utility-to-upgrade]]
+== Using the Quick Installer to Upgrade
+
+If you installed {product-title} using the
+xref:../../install_config/install/quick_install.adoc#install-config-install-quick-install[quick installation] method,
+you should have an installation configuration file located at
+*_~/.config/openshift/installer.cfg.yml_*. The quick installer requires this file to
+start an upgrade.
+
+The quick installer supports upgrading between minor versions of {product-title}
+(one minor version at a time, e.g., 3.5 to 3.6) as well as between
+xref:../../release_notes/ocp_3_6_release_notes.adoc#ocp-36-asynchronous-errata-updates[asynchronous errata updates] within a minor version (e.g., 3.6.z).
+
+If you have an older format installation configuration file in
+*_~/.config/openshift/installer.cfg.yml_* from an installation of a previous
+cluster version, the quick installer will attempt to upgrade the file to the new supported
+format. If you do not have an installation configuration file of any format, you
+can
+xref:../../install_config/install/quick_install.adoc#defining-an-installation-configuration-file[create one manually].
+
+To start an upgrade with the quick installer:
+
+. Satisfy the steps in xref:preparing-for-an-automated-upgrade[Preparing for an Automated Upgrade] to ensure you are using the latest upgrade playbooks.
+
+. Run the quick installer with the `upgrade` subcommand:
++
+----
+# atomic-openshift-installer upgrade
+----
+. Then, follow the on-screen instructions to upgrade to the latest release.
++
+[NOTE]
+====
+If the quick installer fails, note the error output and check
+xref:upgrading_known_issues.adoc#install-config-upgrading-known-issues[Known Issues] for any additional steps.
+====
+
+include::install_config/upgrading/automated_upgrades.adoc[tag=automated_upgrade_after_reboot]
 
 [[running-the-upgrade-playbook-directly]]
 == Running Upgrade Playbooks Directly

install_config/upgrading/manual_upgrades.adoc

@@ -897,12 +897,14 @@ Because RHEL Atomic Host 7 cannot use *yum* to update packages, the following
 steps must take place on a RHEL 7 system.
 ====
 
-Update the packages that provide the example JSON files. On a subscribed Red
-Hat Enterprise Linux 7 system where you can run the CLI as a user with
-*cluster-admin* permissions, install or update to the latest version of the *openshift-ansible* packages:
+Update the packages that provide the example JSON files. On a subscribed Red Hat
+Enterprise Linux 7 system where you can run the CLI as a user with
+*cluster-admin* permissions, install or update to the latest version of the
+*atomic-openshift-utils* package, which should also update the
+*openshift-ansible-* packages:
 
 ----
-# yum update openshift-ansible
+# yum update atomic-openshift-utils
 ----
 
 To persist *_/usr/share/openshift/examples/_* on the first master: