From d4264cd44732db378a5c5793952c6dbe1ac83b08 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Fri, 13 Feb 2026 16:32:09 +0000
Subject: [PATCH] api: Remove errant field

A follow-up for Ia178c1314f99c719827e3eb78735d1019852a273 and
I0e42de5074dcf699886b20dfd43306683e381ee2. 'adminPass' is only
(optionally) returned in server create and rebuild responses, not in
server show or update responses.

Change-Id: I2c4ce7a2b1063d71561d6af95a58a36b39356879
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
 nova/api/openstack/compute/schemas/servers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/api/openstack/compute/schemas/servers.py b/nova/api/openstack/compute/schemas/servers.py
index 305d32236467..a56e9f28631a 100644
--- a/nova/api/openstack/compute/schemas/servers.py
+++ b/nova/api/openstack/compute/schemas/servers.py
@@ -941,7 +941,6 @@ _server_response = {
             },
             'additionalProperties': False,
         },
-        'adminPass': {'type': ['null', 'string']},
         'config_drive': {
             'type': ['string', 'null'], 'enum': ['', 'True', 'False', None],
         },
@@ -1480,7 +1479,6 @@ update_response = {
                     },
                     'additionalProperties': False,
                 },
-                'adminPass': {'type': ['null', 'string']},
                 'created': {'type': 'string', 'format': 'date-time'},
                 'fault': {
                     'type': 'object',
@@ -1884,6 +1882,8 @@ rebuild_response = {
                 'OS-DCF:diskConfig': {'type': 'string'},
             },
             'required': [
+                # adminPass is an unfortunate example of config-driven
+                # API behavior and isn't present unless enabled
                 'accessIPv4',
                 'accessIPv6',
                 'addresses',