From e171bc258f36d308bfd37596af0baaf73775dab4 Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Fri, 3 Jan 2020 16:13:53 +0800 Subject: [PATCH] Remove the deprecated [glance]glance_num_retries The configuration option was deprecated and removed. Change-Id: I0287eae5e4d533f89e232e327c164a018ef86c84 --- ironic/conf/glance.py | 2 -- .../notes/remove-glance-num-retries-24898fc9230d9497.yaml | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/remove-glance-num-retries-24898fc9230d9497.yaml diff --git a/ironic/conf/glance.py b/ironic/conf/glance.py index a96f38a63c..c83fa92e17 100644 --- a/ironic/conf/glance.py +++ b/ironic/conf/glance.py @@ -108,8 +108,6 @@ opts = [ 'multiple containers to store images, and this value ' 'will determine how many containers are created.')), cfg.IntOpt('num_retries', - # TODO(dtantsur): remove in U - deprecated_name='glance_num_retries', default=0, help=_('Number of retries when downloading an image from ' 'glance.')), diff --git a/releasenotes/notes/remove-glance-num-retries-24898fc9230d9497.yaml b/releasenotes/notes/remove-glance-num-retries-24898fc9230d9497.yaml new file mode 100644 index 0000000000..d988570738 --- /dev/null +++ b/releasenotes/notes/remove-glance-num-retries-24898fc9230d9497.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The configuration option ``[glance]glance_num_retries`` was deprecated and + now removed, please use ``[glance]num_retries`` instead.