From 4ae92bdd30d356ac84b24e4321138b2ebee7d7f5 Mon Sep 17 00:00:00 2001 From: Erno Kuvaja Date: Thu, 19 Sep 2019 12:32:51 +0100 Subject: [PATCH] Revert "Correct the deprecation messages of local dir config" this is not needed as 4265e61bc84ce9bd085a95d8734647f4875af740 is being reverted also. This reverts commit b639ed080d5b74fcc3081a09bd64dd4703dea5a4. Change-Id: I3c1b86e73a25935f2a2ffd43731e2db36fbffa97 --- glance/common/config.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/glance/common/config.py b/glance/common/config.py index 5220998702..fca83a982a 100644 --- a/glance/common/config.py +++ b/glance/common/config.py @@ -133,10 +133,9 @@ Related Options: deprecated_for_removal=True, deprecated_since="Train", deprecated_reason=_(""" -With the introduction of the Glance multistore feature, the way of -configuring this option has changed. Please refer to -[os_glance_tasks_store]/filesystem_store_datadir for multistore -configuration. +With the introduction of the Glance multistore feature, it is +no longer necessary to reserve a local directory for the tasks +workspace. Instead, a more flexible filesystem store can be used. This option is scheduled to be removed early in the 'U' development cycle. @@ -173,7 +172,6 @@ Possible values: Related Options: * enabled_backends - * [os_glance_tasks_store]/filesystem_store_datadir """)), ] @@ -678,10 +676,10 @@ Relation options: deprecated_for_removal=True, deprecated_since="Train", deprecated_reason=_(""" -With the introduction of the Glance multistore feature, the way of -configuring this option has changed. Please refer to -[os_glance_staging_store]/filesystem_store_datadir for multistore -configuration. +With the introduction of the Glance multistore feature, it is +no longer necessary to reserve a local directory for the temporary +image staging area. Instead, a more flexible filesystem store can +be used. This option is scheduled to be removed early in the 'U' development cycle. @@ -715,7 +713,6 @@ Possible values: Related options: * [task]/work_dir * enabled_backends - * [os_glance_staging_store]/filesystem_store_datadir """)), cfg.ListOpt('enabled_import_methods',