Merge branch '13647-keepstore-config'

refs #13647

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined doc/admin/upgrading.html.textile.liquid
index ddb52fc23aa8313e8c1a38045063eac8f98f6b33,a403a368c1a7d2d3bb752a1508d1c130b6b803c6..5faf79cde7a57f317b7f5efe9fbf6f3f17632c54
--- 1/doc/admin/upgrading.html.textile.liquid
--- 2/doc/admin/upgrading.html.textile.liquid
+++ b/doc/admin/upgrading.html.textile.liquid
@@@ -41,13 -41,28 +41,28 @@@ table(table table-bordered table-conden
  
  h3(#master). development master (as of 2019-08-12)
  
+ h4. Delete "keep_services" records
+ 
+ After all keepproxy and keepstore configurations have been migrated to the centralized configuration file (see below), all keep_services records you added manually during installation should be removed. System logs from keepstore and keepproxy at startup, as well as the output of @arvados-server config-check@, will remind you to do this.
+ 
+ <notextile><pre><code>$ export ARVADOS_API_HOST=...
+ $ export ARVADOS_API_TOKEN=...
+ $ arv --format=uuid keep_service list | xargs -n1 arv keep_service delete --uuid
+ </code></pre></notextile>
+ 
+ Once these old records are removed, @arv keep_service list@ will instead return the services listed under Services/Keepstore/InternalURLs and Services/Keepproxy/ExternalURL in your centralized configuration file.
+ 
  h4. Arv-git-httpd configuration migration
  
  (feature "#14712":https://dev.arvados.org/issues/14712 ) The arv-git-httpd package can now be configured using the centralized configuration file at @/etc/arvados/config.yml@. Configuration via individual command line arguments is no longer available. Please see "arv-git-httpd's config migration guide":{{site.baseurl}}/admin/config-migration.html#arv-git-httpd for more details.
  
- h4. Keep-web dropped support on command line flags configuration
+ h4. Keepstore and keep-web configuration migration
+ 
+ keepstore and keep-web no longer support configuration via (previously deprecated) command line configuration flags and environment variables.
+ 
+ keep-web now supports the legacy @keep-web.yml@ config format (used by Arvados 1.4) and the new cluster config file format. Please check "keep-web's install guide":{{site.baseurl}}/install/install-keep-web.html for more details.
  
- As we're migrating to a central cluster configuration file, the already deprecated way of getting configurations via environment variables and command line flags isn't valid anymore. Current keep-web supports both the now legacy @keep-web.yml@ config format (used by Arvados 1.4) and the new cluster config file format. Please check "keep-web's install guide":{{site.baseurl}}/install/install-keep-web.html for more details.
+ keepstore now supports the legacy @keepstore.yml@ config format (used by Arvados 1.4) and the new cluster config file format. Please check the "keepstore config migration notes":{{site.baseurl}}/admin/config-migration.html#keepstore and "keepstore install guide":{{site.baseurl}}/install/install-keepstore.html for more details.
  
  h4. Jobs API is read-only
  
@@@ -98,12 -113,6 +113,12 @@@ h4. Migrating to centralized config.ym
  
  See "Migrating Configuration":config-migration.html for notes on migrating legacy per-component configuration files to the new centralized @/etc/arvados/config.yml@.  To ensure a smooth transition, the per-component config files continue to be read, and take precedence over the centralized configuration.
  
 +h3(#v1_4_1). v1.4.1 (2019-09-20)
 +
 +h4. Centos7 Python 3 dependency upgraded to rh-python36
 +
 +The Python 3 dependency for Centos7 Arvados packages was upgraded from rh-python35 to rh-python36.
 +
  h3(#v1_4_0). v1.4.0 (2019-06-05)
  
  h4. Populating the new file_count and file_size_total columns on the collections table