From 36f5e3962cda999c39f3fc8b76d517d4f8d419bb Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 29 Nov 2022 10:13:38 +0900 Subject: [PATCH] Glance: Stop setting native ssl parameters Glance has already removed support for native ssl support[1]. These glance::api class parameters were also deprecated and will be removed during this cycle. [1] 2a2f349d8a1f0426f77bdbea6c70a316b4c3daa0 Depends-on: https://review.opendev.org/834501 Change-Id: I72fd6841d24197e9c747116437d49911e9c5b8b0 --- manifests/glance.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/glance.pp b/manifests/glance.pp index 77e6cc821..3e3936c76 100644 --- a/manifests/glance.pp +++ b/manifests/glance.pp @@ -17,14 +17,16 @@ class openstack_integration::glance ( include openstack_integration::config include openstack_integration::params + # TODO(tkajinam): Glance no longer supports native ssl since Ussuri release, + # so these parameters are unused now. if $::openstack_integration::config::ssl { openstack_integration::ssl_key { 'glance': } $key_file = undef - $crt_file = undef + $crt_file = undef } else { $key_file = undef - $crt_file = undef + $crt_file = undef } openstack_integration::mq_user { 'glance': @@ -104,8 +106,6 @@ class openstack_integration::glance ( enabled_backends => $enabled_backends, default_backend => $default_backend, bind_host => $::openstack_integration::config::host, - cert_file => $crt_file, - key_file => $key_file, } class { 'glance::cron::db_purge': } class { 'glance::notify::rabbitmq':