Merge pull request #3093 from adellape/ocp3313

Add OCP 3.3.1.3 relnotes

Author: adellape

install_config/install/disconnected_install.adoc

@@ -2,6 +2,8 @@
 = Disconnected Installation
 {product-author}
 {product-version}
+:latest-tag: v3.3.1.3
+:latest-int-tag: 3.3.1
 :data-uri:
 :icons:
 :experimental:
@@ -165,30 +167,36 @@ To sync the container images:
 # systemctl start docker
 ----
 
-. Pull all of the required {product-title} containerized components:
+. Pull all of the required {product-title} containerized components.
+ifdef::openshift-enterprise[]
+Replace `<tag>` with `{latest-tag}` for the latest version.
+endif::[]
 +
 ----
-# docker pull registry.access.redhat.com/openshift3/ose-haproxy-router:v3.3.0.34
-# docker pull registry.access.redhat.com/openshift3/ose-deployer:v3.3.0.34
-# docker pull registry.access.redhat.com/openshift3/ose-sti-builder:v3.3.0.34
-# docker pull registry.access.redhat.com/openshift3/ose-docker-builder:v3.3.0.34
-# docker pull registry.access.redhat.com/openshift3/ose-pod:v3.3.0.34
-# docker pull registry.access.redhat.com/openshift3/ose-docker-registry:v3.3.0.34
+# docker pull registry.access.redhat.com/openshift3/ose-haproxy-router:<tag>
+# docker pull registry.access.redhat.com/openshift3/ose-deployer:<tag>
+# docker pull registry.access.redhat.com/openshift3/ose-sti-builder:<tag>
+# docker pull registry.access.redhat.com/openshift3/ose-docker-builder:<tag>
+# docker pull registry.access.redhat.com/openshift3/ose-pod:<tag>
+# docker pull registry.access.redhat.com/openshift3/ose-docker-registry:<tag>
 ----
 
 . Pull all of the required {product-title} containerized components for the
-additional centralized log aggregation and metrics aggregation components:
+additional centralized log aggregation and metrics aggregation components.
+ifdef::openshift-enterprise[]
+Replace `<tag>` with `{latest-int-tag}` for the latest version.
+endif::[]
 +
 ----
-# docker pull registry.access.redhat.com/openshift3/logging-deployment
-# docker pull registry.access.redhat.com/openshift3/logging-elasticsearch
-# docker pull registry.access.redhat.com/openshift3/logging-kibana
-# docker pull registry.access.redhat.com/openshift3/logging-fluentd
-# docker pull registry.access.redhat.com/openshift3/logging-auth-proxy
-# docker pull registry.access.redhat.com/openshift3/metrics-deployer
-# docker pull registry.access.redhat.com/openshift3/metrics-hawkular-metrics
-# docker pull registry.access.redhat.com/openshift3/metrics-cassandra
-# docker pull registry.access.redhat.com/openshift3/metrics-heapster
+# docker pull registry.access.redhat.com/openshift3/logging-deployer:<tag>
+# docker pull registry.access.redhat.com/openshift3/logging-elasticsearch:<tag>
+# docker pull registry.access.redhat.com/openshift3/logging-kibana:<tag>
+# docker pull registry.access.redhat.com/openshift3/logging-fluentd:<tag>
+# docker pull registry.access.redhat.com/openshift3/logging-auth-proxy:<tag>
+# docker pull registry.access.redhat.com/openshift3/metrics-deployer:<tag>
+# docker pull registry.access.redhat.com/openshift3/metrics-hawkular-metrics:<tag>
+# docker pull registry.access.redhat.com/openshift3/metrics-cassandra:<tag>
+# docker pull registry.access.redhat.com/openshift3/metrics-heapster:<tag>
 ----
 
 . Pull the Red Hat-certified
@@ -253,7 +261,7 @@ and then transporting them:
 +
 ----
 # docker save -o ose3-logging-metrics-images.tar \
-    registry.access.redhat.com/openshift3/logging-deployment \
+    registry.access.redhat.com/openshift3/logging-deployer \
     registry.access.redhat.com/openshift3/logging-elasticsearch \
     registry.access.redhat.com/openshift3/logging-kibana \
     registry.access.redhat.com/openshift3/logging-fluentd \

install_config/upgrading/automated_upgrades.adoc

@@ -2,6 +2,7 @@
 = Performing Automated In-place Cluster Upgrades
 {product-author}
 {product-version}
+:latest-tag: v3.3.1.3
 :data-uri:
 :icons:
 :experimental:
@@ -107,45 +108,46 @@ ifdef::openshift-enterprise[]
 [[preparing-for-an-automated-upgrade]]
 == Preparing for an Automated Upgrade
 
-[NOTE]
+[IMPORTANT]
 ====
 Before upgrading your cluster to {product-title} 3.3, the cluster must be
 already upgraded to the
-link:https://docs.openshift.com/enterprise/3.2/release_notes/ose_3_2_release_notes.adoc#ose-32-asynchronous-errata-updates[latest asynchronous release of version 3.2]. Cluster upgrades cannot span more than one
+link:https://docs.openshift.com/enterprise/3.2/release_notes/ose_3_2_release_notes.html#ose-32-asynchronous-errata-updates[latest asynchronous release of version 3.2]. Cluster upgrades cannot span more than one
 minor version at a time, so if your cluster is at version 3.0 or 3.1, you must
 first upgrade incrementally (e.g., 3.0 to 3.1, then 3.1 or 3.2).
 ====
 
-If you are upgrading from version 3.2 to 3.3, on each master and node host you
-must manually disable the 3.2 channel and enable the 3.3 channel:
+To prepare for an automated upgrade:
 
-====
+. If you are upgrading from version 3.2 to 3.3, manually disable the 3.2 channel and enable the 3.3 channel on each master and node host:
++
 ----
 # subscription-manager repos --disable="rhel-7-server-ose-3.2-rpms" \
     --enable="rhel-7-server-ose-3.3-rpms"\
     --enable="rhel-7-server-extras-rpms"
 # yum clean all
 ----
-====
-
-For any upgrade path, always ensure that you have the latest version of the
+. For any upgrade path, always ensure that you have the latest version of the
 *atomic-openshift-utils* package, which should also update the
 *openshift-ansible-** packages:
-
++
 ----
 # yum update atomic-openshift-utils
 ----
-
-Lastly, you must be logged in as a cluster administrative user on the master
+. Lastly, you must be logged in as a cluster administrative user on the master
 host for the upgrade to succeed:
++
 ----
 $ oc login
 ----
 
-There are two methods for running the automated upgrade:
-xref:upgrading-using-the-installation-utility-to-upgrade[using the installer]
-or xref:running-the-upgrade-playbook-directly[running the upgrade playbook
-directly]. Choose and follow one method.
+After satisfying these steps, there are two methods for running the automated
+upgrade:
+
+- xref:upgrading-using-the-installation-utility-to-upgrade[Using the 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 Installer to Upgrade
@@ -167,20 +169,21 @@ 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 the upgrade, run the installer with the `upgrade` subcommand:
+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 installer with the `upgrade` subcommand:
++
 ----
 # atomic-openshift-installer upgrade
 ----
-
-Then, follow the on-screen instructions to upgrade to the latest release.
-
+. Then, follow the on-screen instructions to upgrade to the latest release.
 // tag::automated_upgrade_after_reboot[]
-When the upgrade finishes, a recommendation will be printed to reboot all hosts.
-After rebooting, if there are no features enabled, you can
+. When the upgrade finishes, a recommendation will be printed to reboot all hosts.
+After rebooting, if there are no additional features enabled, you can
 xref:verifying-the-upgrade[verify the upgrade]. Otherwise, the next step depends
 on what features are enabled.
-
++
 [cols="1,4"]
 |===
 | Feature | Next Step
@@ -196,63 +199,64 @@ on what features are enabled.
 [[running-the-upgrade-playbook-directly]]
 == Running the Upgrade Playbook Directly
 
-Alternatively, you can run the upgrade playbook with Ansible directly, similar
+You can run the automated upgrade playbook using Ansible directly, similar
 to the advanced installation method, if you have an inventory file.
 
+The same *_v3_3_* upgrade playbook can be used to upgrade either of the
+following to the latest 3.3 release:
+
+- xref:upgrading-to-ocp-3-3[Existing {product-title} 3.2 clusters]
+- xref:upgrading-to-ocp-3-3-asynchronous-releases[Existing {product-title} 3.3 clusters]
+
 [[upgrading-to-ocp-3-3]]
 === Upgrading to {product-title} 3.3
 
-Before running the upgrade, first ensure the `*deployment_type*` parameter in
-your inventory file is set to `openshift-enterprise`.
+To run an upgrade from {product-title} 3.2 to 3.3:
 
-If you have multiple masters configured and want to enable rolling, full system
+. Satisfy the steps in xref:preparing-for-an-automated-upgrade[Preparing for an Automated Upgrade] to ensure you are using the latest upgrade playbooks.
+. Ensure the `*deployment_type*` parameter in your inventory file is set to
+`openshift-enterprise`.
+. If you have multiple masters configured and want to enable rolling, full system
 restarts of the hosts, you can set the `*openshift_rolling_restart_mode*`
 parameter in your inventory file to `system`. Otherwise, the default value
 *services* performs rolling service restarts on HA masters, but does not reboot
 the systems. See
 xref:../install/advanced_install.adoc#configuring-cluster-variables[Configuring
 Cluster Variables] for details.
-
-Then, run the *_v3_3_* upgrade playbook. If your inventory file is
-located somewhere other than the default *_/etc/ansible/hosts_*, add the `-i`
-flag to specify the location. If you previously used the
-`atomic-openshift-installer` command to run your installation, you can check
-*_~/.config/openshift/hosts_* (previously located at
-*_~/.config/openshift/.ansible/hosts_*) for the last inventory file that was
-used, if needed.
-
+. Run the *_v3_3_* upgrade playbook. If your inventory file is located somewhere
+other than the default *_/etc/ansible/hosts_*, add the `-i` flag to specify the
+location. If you previously used the `atomic-openshift-installer` command to run
+your installation, you can check *_~/.config/openshift/hosts_* (previously
+located at *_~/.config/openshift/.ansible/hosts_*) for the last inventory file
+that was used, if needed.
++
 ----
 # ansible-playbook [-i </path/to/inventory/file>] \
     /usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml
 ----
-
 include::install_config/upgrading/automated_upgrades.adoc[tag=automated_upgrade_after_reboot]
 
 [[upgrading-to-ocp-3-3-asynchronous-releases]]
 === Upgrading to {product-title} 3.3 Asynchronous Releases
 
 To apply
-xref:../../release_notes/ocp_3_3_release_notes.html#ocp-33-asynchronous-errata-updates[asynchronous errata updates] to an existing {product-title} 3.3 cluster, first upgrade the
-*atomic-openshift-utils* package on the Red Hat Enterprise Linux 7 system where
-you will be running Ansible:
+xref:../../release_notes/ocp_3_3_release_notes.html#ocp-33-asynchronous-errata-updates[asynchronous errata updates] to an existing {product-title} 3.3 cluster:
 
-----
-# yum update atomic-openshift-utils
-----
 
-Then, run the same *_v3_3_* upgrade playbook that is used for
-xref:upgrading-to-ocp-3-3[upgrading to {product-title} 3.3 from 3.2]. If your inventory file is located somewhere other than the default
+. 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 *_v3_3_* upgrade playbook (the same playbook that is used for
+xref:upgrading-to-ocp-3-3[upgrading from {product-title} 3.2 to 3.3]). If your
+inventory file is located somewhere other than the default
 *_/etc/ansible/hosts_*, add the `-i` flag to specify the location. If you
 previously used the `atomic-openshift-installer` command to run your
 installation, you can check *_~/.config/openshift/hosts_* (previously located at
-*_~/.config/openshift/.ansible/hosts_*) for the last
-inventory file that was used, if needed.
-
+*_~/.config/openshift/.ansible/hosts_*) for the last inventory file that was
+used, if needed.
++
 ----
 # ansible-playbook [-i </path/to/inventory/file>] \
     /usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml
 ----
-
 include::install_config/upgrading/automated_upgrades.adoc[tag=automated_upgrade_after_reboot]
 endif::[]
 
@@ -282,28 +286,29 @@ to the latest metric components.
 [[verifying-the-upgrade]]
 == Verifying the Upgrade
 
-To verify the upgrade, first check that all nodes are marked as *Ready*:
+To verify the upgrade:
 
-====
+. First check that all nodes are marked as *Ready*:
++
 ----
 # oc get nodes
 NAME                        STATUS                     AGE
 master.example.com          Ready,SchedulingDisabled   165d
 node1.example.com           Ready                      165d
 node2.example.com           Ready                      165d
 ----
-====
-
-Then, verify that you are running the expected versions of the *docker-registry*
-and *router* images, if deployed:
-
-====
+. Then, verify that you are running the expected versions of the *docker-registry*
+and *router* images, if deployed.
+ifdef::openshift-enterprise[]
+Replace `<tag>` with `{latest-tag}` for the latest version.
+endif::[]
++
 ----
 ifdef::openshift-enterprise[]
 # oc get -n default dc/docker-registry -o json | grep \"image\"
-    "image": "openshift3/ose-docker-registry:v3.3.0.34",
+    "image": "openshift3/ose-docker-registry:<tag>",
 # oc get -n default dc/router -o json | grep \"image\"
-    "image": "openshift3/ose-haproxy-router:v3.3.0.34",
+    "image": "openshift3/ose-haproxy-router:<tag>",
 endif::[]
 ifdef::openshift-origin[]
 # oc get -n default dc/docker-registry -o json | grep \"image\"
@@ -312,23 +317,18 @@ ifdef::openshift-origin[]
     "image": "openshift/origin-haproxy-router:v1.0.6",
 endif::[]
 ----
-====
-
 ifdef::openshift-origin[]
-If you upgraded from Origin 1.0 to Origin 1.1, verify in your old
+. If you upgraded from Origin 1.0 to Origin 1.1, verify in your old
 *_/etc/sysconfig/openshift-master_* and *_/etc/sysconfig/openshift-node_* files
 that any custom configuration is added to your new
 *_/etc/sysconfig/origin-master_* and *_/etc/sysconfig/origin-node_* files.
 endif::[]
-
-After upgrading, you can use the diagnostics tool on the master to look for
+. After upgrading, you can use the diagnostics tool on the master to look for
 common issues:
-
-====
++
 ----
 # oadm diagnostics
 ...
 [Note] Summary of diagnostics execution:
 [Note] Completed with no errors or warnings seen.
 ----
-====