From 87a74258398cbf4323e776a5a61d104dde4f5def Mon Sep 17 00:00:00 2001
From: "wu.chunyang" <wuchunyang@yovole.com>
Date: Tue, 4 Jan 2022 22:11:51 +0800
Subject: [PATCH] Remove obsolete opt from cinder.conf
glance_api_version and os_region_name are removed from cinder.
see: https://docs.openstack.org/cinder/xena/configuration/block-storage/samples/cinder.conf.html
Closes-Bug: #1830997
Change-Id: I751bfe64d47935f183ff2ca891ec56f61e618009
---
ansible/roles/cinder/templates/cinder.conf.j2 | 3 ---
1 file changed, 3 deletions(-)
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index c4d99c6adc..533e8d5218 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -19,11 +19,8 @@ volume_name_template = volume-%s
glance_api_servers = {{ glance_internal_endpoint }}
glance_num_retries = {{ groups['glance-api'] | length }}
-glance_api_version = 2
glance_ca_certificates_file = {{ openstack_cacert }}
-os_region_name = {{ openstack_region_name }}
-
{% if cinder_enabled_backends %}
enabled_backends = {{ cinder_enabled_backends|map(attribute='name')|join(',') }}
{% endif %}