More install/upgrade edits

_topic_map.yml

@@ -229,7 +229,7 @@ Topics:
     File: index
   - Name: Template Service Broker
     File: template_service_broker
-  - Name: Ansible Service Broker
+  - Name: OpenShift Ansible Broker
     File: ansible_service_broker
 - Name: Revision History
   File: revhistory_architecture

architecture/service_catalog/ansible_service_broker.adoc

@@ -1,5 +1,5 @@
 [[arch-ansible-service-broker]]
-= Ansible Service Broker
+= OpenShift Ansible Broker
 {product-author}
 {product-version}
 :data-uri:

install_config/aggregate_logging.adoc

@@ -3,10 +3,10 @@
 {product-author}
 {product-version}
 ifdef::openshift-enterprise[]
-:latest-tag: v3.6.173.0.5
+:latest-tag: v3.7.9
 endif::[]
 ifdef::openshift-origin[]
-:latest-tag: v1.6.0
+:latest-tag: v3.7.9
 endif::[]
 :data-uri:
 :icons:

install_config/install/advanced_install.adoc

@@ -1621,10 +1621,10 @@ endif::[]
 
 When the service catalog is enabled, the web console shows the updated landing
 page. The OpenShift Ansible broker and template service broker are both enabled
-as well; see xref:configuring-ansible-service-broker[Configuring the Ansible Service Broker] and xref:configuring-template-service-broker[Configuring the Template Service Broker] for more information.
+as well; see xref:configuring-openshift-ansible-broker[Configuring the OpenShift Ansible Broker] and xref:configuring-template-service-broker[Configuring the Template Service Broker] for more information.
 
-[[configuring-ansible-service-broker]]
-=== Configuring the Ansible Service Broker
+[[configuring-openshift-ansible-broker]]
+=== Configuring the OpenShift Ansible Broker
 
 Starting with {product-title} 3.7, the
 xref:../../architecture/service_catalog/ansible_service_broker.adoc#arch-ansible-service-broker[OpenShift Ansible broker] (OAB) is enabled by default.
@@ -1701,23 +1701,15 @@ instance during cluster installation.
 
 Starting with {product-title} 3.7, the xref:../../architecture/service_catalog/template_service_broker.adoc#arch-template-service-broke[template service broker] (TSB) is enabled by default.
 
-To configure the TSB:
+To configure the TSB, one or more projects must be defined as the broker's
+source namespace(s) for loading templates and image streams into the service
+catalog. Set the desired projects by modifying the following in your inventory
+file's `[OSEv3:vars]` section:
 
-. One or more projects must be defined as the broker's source
-namespace(s) for loading templates and image streams into the service catalog.
-Set the desired projects by modifying the following in your inventory file's
-`[OSEv3:vars]` section:
-+
 ----
 openshift_template_service_broker_namespaces=['openshift','myproject']
 ----
 
-. The installer currently does not automate installation of the TSB, so additional
-steps must be run manually after the cluster installation has completed.
-Continue with the rest of the preparation of your inventory file, then see
-xref:running-the-advanced-installation[Running the Advanced Installation] for
-the additional steps to deploy the TSB.
-
 [[configuring-web-console-customization]]
 === Configuring Web Console Customization
 
@@ -2227,6 +2219,8 @@ infra-node2.example.com openshift_node_labels="{'region': 'infra', 'zone': 'defa
 To use this example, modify the file to match your environment and
 specifications, and save it as *_/etc/ansible/hosts_*.
 
+
+
 [[running-the-advanced-installation]]
 == Running the Advanced Installation
 

install_config/install/disconnected_install.adoc

@@ -2,9 +2,9 @@
 = Disconnected Installation
 {product-author}
 {product-version}
-:latest-tag: v3.7
-:latest-int-tag: v3.7
-:latest-registry-console-tag: v3.7
+:latest-tag: v3.7.9
+:latest-int-tag: v3.7.9
+:latest-registry-console-tag: v3.7.9
 :data-uri:
 :icons:
 :experimental:

install_config/upgrading/automated_upgrades.adoc

@@ -2,8 +2,8 @@
 = Performing Automated In-place Cluster Upgrades
 {product-author}
 {product-version}
-:latest-tag: v3.7
-:latest-int-tag: v3.7.0
+:latest-tag: v3.7.9
+:latest-int-tag: v3.7.9
 :data-uri:
 :icons:
 :experimental:
@@ -239,10 +239,13 @@ enabled.
 +
 [cols="1,4"]
 |===
-| Feature | Next Step
+|Feature |Next Step
 
-| Aggregated Logging
-| xref:automated-upgrading-efk-logging-stack[Upgrade the EFK logging stack.]
+|Service Catalog
+|xref:automated-upgrading-service-catalog[Enable and configure the service catalog.]
+
+|Aggregated Logging
+|xref:automated-upgrading-efk-logging-stack[Upgrade the EFK logging stack.]
 
 | Cluster Metrics
 | xref:automated-upgrading-cluster-metrics[Upgrade cluster metrics.]
@@ -519,6 +522,41 @@ ifdef::openshift-origin[]
 include::install_config/upgrading/manual_upgrades.adoc[tag=30to31updatingcerts]
 endif::[]
 
+[[automated-upgrading-service-catalog]]
+== Upgrading the Service Catalog
+
+// tag::automated-service-catalog-upgrade-steps[]
+Starting with {product-title} 3.7, the service catalog, OpenShift Ansible
+broker, and template service broker are enabled and deployed by default for new
+cluster installations. However, they are not deployed by default during the
+upgrade from {product-title} 3.6 to 3.7, so you must run an individual component
+playbook separate post-upgrade.
+
+[NOTE]
+====
+Upgrading from the {product-title} 3.6 Technology Preview version of the service
+catalog and service brokers is not supported.
+====
+
+To upgrade to these features:
+
+. See the following three sections in the
+xref:../../install_config/install/advanced_install.adoc#install-config-install-advanced-install[Advanced Installation] topic and update your inventory file accordingly:
++
+--
+- xref:../../install_config/install/advanced_install.adoc#enabling-service-catalog[Configuring the Service Catalog]
+- xref:../../install_config/install/advanced_install.adoc#configuring-openshift-ansible-broker[Configuring the OpenShift Ansible Broker]
+- xref:../../install_config/install/advanced_install.adoc#configuring-template-service-broker[Configuring the Template Service Broker]
+--
+
+. Run the following playbook:
++
+----
+# ansible-playbook -i </path/to/inventory/file> \
+    /usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/service-catalog.yml
+----
+// end::automated-service-catalog-upgrade-steps[]
+
 [[automated-upgrading-efk-logging-stack]]
 == Upgrading the EFK Logging Stack
 

install_config/upgrading/manual_upgrades.adoc

@@ -2,8 +2,8 @@
 = Performing Manual In-place Cluster Upgrades
 {product-author}
 {product-version}
-:latest-tag: v3.7
-:latest-int-tag: v3.7
+:latest-tag: v3.7.9
+:latest-int-tag: v3.7.9
 :data-uri:
 :icons:
 :experimental:
@@ -1292,6 +1292,16 @@ After the service restarts, the certificate update is complete.
 // end::30to31updatingcerts[]
 endif::[]
 
+[[manual-upgrading-service-catalog]]
+== Upgrading the Service Catalog
+
+[NOTE]
+====
+Manual upgrade steps for the service catalog and service brokers are not available.
+====
+
+include::install_config/upgrading/automated_upgrades.adoc[tag=automated-service-catalog-upgrade-steps]
+
 [[manual-upgrading-efk-logging-stack]]
 == Upgrading the EFK Logging Stack