17967: Link to config doc page from conf file and upgrade notes.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/doc/admin/upgrading.html.textile.liquid b/doc/admin/upgrading.html.textile.liquid
index dfb6a0ad6e00d9e58cd2fe33bea7f32efc70cadf..b40082deba630f6fa208646b374e9bee311dd0cf 100644 (file)
--- a/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@ -39,6 +39,10 @@ h2(#main). development main (as of 2021-07-15)
 
 "Upgrading from 2.2.0":#v2_2_0
 
+h3. Storage classes must be defined explicitly
+
+If your configuration uses the StorageClasses attribute on any Keep volumes, you must add a new @StorageClasses@ section that lists all of your storage classes. Refer to the updated documentation about "configuring storage classes":{{site.baseurl}}/admin/storage-classes.html for details.
+
 h3. keep-balance requires access to PostgreSQL
 
 Make sure the keep-balance process can connect to your PostgreSQL server using the settings in your config file. (In previous versions, keep-balance accessed the database through controller instead of connecting to the database server directly.)

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index eb05c22fd7bd0250647b296fab31f5cbe569e113..8640e71418fa88c51a7a8c3436949d9371bafee9 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1233,6 +1233,9 @@ Clusters:
       # If you use multiple storage classes, specify them here, using
       # the storage class name as the key (in place of "SAMPLE" in
       # this sample entry).
+      #
+      # Further info/examples:
+      # https://doc.arvados.org/admin/storage-classes.html
       SAMPLE:
 
         # Priority determines the order volumes should be searched