From be8e3aa7ff6037ac48515f17a3d7a904a6e20ffb Mon Sep 17 00:00:00 2001 From: Alex Dellapenta Date: Thu, 22 Sep 2016 17:21:00 -0400 Subject: [PATCH] Follow-up edits to PR#2643 --- install_config/upgrading/manual_upgrades.adoc | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/install_config/upgrading/manual_upgrades.adoc b/install_config/upgrading/manual_upgrades.adoc index 119311e2a50b..01115a31b8d2 100644 --- a/install_config/upgrading/manual_upgrades.adoc +++ b/install_config/upgrading/manual_upgrades.adoc @@ -61,7 +61,7 @@ On RHEL 7 systems, also clear the *yum* cache: ---- # yum clean all ---- -endif::openshift-enterprise[] +endif::[] . Install or update to the latest available version of the *atomic-openshift-utils* package on each RHEL 7 system, which provides files @@ -1274,7 +1274,7 @@ For native HA multiple master deployments: + After the service restarts, the certificate update is complete. // end::30to31updatingcerts[] -endif::openshift-origin[] +endif::[] [[manual-upgrading-efk-logging-stack]] == Upgrading the EFK Logging Stack @@ -1308,13 +1308,13 @@ ifdef::openshift-enterprise[] $ oc apply -n openshift -f \ /usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml ---- -endif::openshift-enterprise[] +endif::[] ifdef::openshift-origin[] ---- $ oc apply -n openshift -f \ https://raw.githubusercontent.com/openshift/origin-aggregated-logging/master/deployer/deployer.yaml ---- -endif::openshift-origin[] +endif::[] . Generate any missing service accounts and roles: + @@ -1322,7 +1322,7 @@ endif::openshift-origin[] $ oc process logging-deployer-account-template | oc apply -f - ---- -. Ensure that the cluster role `oauth-editor` is assigned to the logging-deployer +. Ensure that the cluster role `oauth-editor` is assigned to the *logging-deployer* service account: + ---- @@ -1331,7 +1331,7 @@ $ oadm policy add-cluster-role-to-user oauth-editor \ ---- . In preparation for running the deployer, ensure that you have the configurations -for your current deployment in the xref:../aggregate_logging.adoc#aggregate-logging-specifying-deployer-parameters[logging-deployer configmap]. +for your current deployment in the xref:../aggregate_logging.adoc#aggregate-logging-specifying-deployer-parameters[*logging-deployer* ConfigMap]. + [IMPORTANT] ==== @@ -1345,15 +1345,15 @@ version. $ oc new-app logging-deployer-template -p MODE=upgrade ---- + -Running the deployer in this mode handles scaling down the components to minimize -loss of logs, patching configs, generating missing secrets and keys, and scaling -the components back up to their previous replica count. +Running the deployer in this mode handles scaling down the components to +minimize loss of logs, patching configurations, generating missing secrets and +keys, and scaling the components back up to their previous replica count. + [IMPORTANT] ==== Due to the privileges needed to label and unlabel a node for controlling the deployment -of Fluentd pods, the deployer does delete the logging-fluentd Daemonset and recreates -it from the `logging-fluentd-template` template. +of Fluentd pods, the deployer does delete the *logging-fluentd* Daemonset and recreates +it from the *logging-fluentd-template* template. ==== [[manual-upgrading-cluster-metrics]] @@ -1411,7 +1411,7 @@ This section will be updated over time as new asynchronous updates are released for {product-title} 3.3. See the xref:../../release_notes/ose_3_2_release_notes.adoc#release-notes-ocp-3-3-release-notes[{product-title} 3.3 Release Notes] to review the latest release notes. -endif::openshift-enterprise[] +endif::[] ifdef::openshift-origin[] Read through the following sections carefully depending on your upgrade path, as