From e3f1ad953dff4f3304a050d50589121a6e872d25 Mon Sep 17 00:00:00 2001
From: Alexey Stupnikov <aleksey.stupnikov@gmail.com>
Date: Sat, 13 Mar 2021 15:20:03 +0100
Subject: [PATCH] Remove or fix outdated/incorrect keystone hieradata
 definitions

- keystone::wsgi::apache::servername_admin was removed in Train
  change: I859803f1d79304de5a803753841e994357b045f8

Partial-Bug: #1916386
Change-Id: I340884cbde1ddfa86366a7ba1908087b08a05c85
---
 deployment/keystone/keystone-container-puppet.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 798fe28f82..846f25c226 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -441,12 +441,6 @@ outputs:
                   "%{hiera('fqdn_$NETWORK')}"
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}
-            keystone::wsgi::apache::servername_admin:
-              str_replace:
-                template:
-                  "%{hiera('fqdn_$NETWORK')}"
-                params:
-                  $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}
             keystone::wsgi::apache::workers: {get_param: KeystoneWorkers}
             # override via extraconfig:
             keystone::wsgi::apache::threads: 1