From bc5614d9bef58e5d62ba249fec801d7ad5128525 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 6 Feb 2026 00:17:11 +0900
Subject: [PATCH] devstack: Remove ineffective ssl options

The [DEFAULT] enabled_ssl_apis option has never been implemented in
watcher. Also in recent devstack tls-proxy is used to terminate SSL
connection.

Change-Id: Iaad11479046c0dd11729b35da7cce6558af58132
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 devstack/lib/watcher | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/devstack/lib/watcher b/devstack/lib/watcher
index 0d754055e..1709e7856 100644
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -44,7 +44,7 @@ WATCHER_POLICY_YAML=$WATCHER_CONF_DIR/policy.yaml.sample
 WATCHER_DEVSTACK_DIR=$WATCHER_DIR/devstack
 WATCHER_DEVSTACK_FILES_DIR=$WATCHER_DEVSTACK_DIR/files
 
-if is_ssl_enabled_service "watcher" || is_service_enabled tls-proxy; then
+if is_service_enabled tls-proxy; then
     WATCHER_SERVICE_PROTOCOL="https"
 fi
 
@@ -173,16 +173,6 @@ function create_watcher_conf {
     setup_logging $WATCHER_CONF
 
     write_uwsgi_config "$WATCHER_UWSGI_CONF" "$WATCHER_UWSGI" "/infra-optim" "" "watcher-api"
-
-    # Register SSL certificates if provided
-    if is_ssl_enabled_service watcher; then
-        ensure_certificates WATCHER
-
-        iniset $WATCHER_CONF DEFAULT ssl_cert_file "$WATCHER_SSL_CERT"
-        iniset $WATCHER_CONF DEFAULT ssl_key_file "$WATCHER_SSL_KEY"
-
-        iniset $WATCHER_CONF DEFAULT enabled_ssl_apis "$WATCHER_ENABLED_APIS"
-    fi
 }
 
 # init_watcher() - Initialize databases, etc.