summaryrefslogtreecommitdiff
path: root/ironic/common/glance_service
diff options
context:
space:
mode:
authorPavlo Shchelokovskyy <shchelokovskyy@gmail.com>2018-06-06 15:35:25 +0300
committerPavlo Shchelokovskyy <shchelokovskyy@gmail.com>2018-06-11 13:30:50 +0000
commit47c2b15ea9b68be533f0f8c5cb7eb0076ef488f3 (patch)
treeff2748e6e12f41abdefad0a450aeb1c978089ddb /ironic/common/glance_service
parentd69dc019cb0573a3edcbff3ccca479cefc5ec67c (diff)
downloadironic-47c2b15ea9b68be533f0f8c5cb7eb0076ef488f3.tar.gz
Remove deprecated [keystone] config section
this section contains only deprecated 'region_name' option, and thus can be removed altogether. Change-Id: Ib9308589fbbb06637146d152681700463c3e6333
Diffstat (limited to 'ironic/common/glance_service')
-rw-r--r--ironic/common/glance_service/base_image_service.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/ironic/common/glance_service/base_image_service.py b/ironic/common/glance_service/base_image_service.py
index a30391354..fd73dc4e6 100644
--- a/ironic/common/glance_service/base_image_service.py
+++ b/ironic/common/glance_service/base_image_service.py
@@ -98,11 +98,7 @@ def check_image_service(func):
service_auth = keystone.get_auth('glance')
- # TODO(pas-ha) remove in Rocky
adapter_params = {}
- if CONF.keystone.region_name and not CONF.glance.region_name:
- adapter_params['region_name'] = CONF.keystone.region_name
-
adapter = keystone.get_adapter('glance', session=session,
auth=service_auth, **adapter_params)
self.endpoint = adapter.get_endpoint()