From 82cd0ad3f70db33cac8e34afbb20f8248b647b01 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 22 Aug 2019 16:32:07 +0900 Subject: [PATCH] Remove deprecated options for keystone eventlet server This patch removes keystone options related to deprecated eventlet server implementation. We do not need them because currently we use httpd to run keystone as its wsgi application. Change-Id: I6fe4de67dbe38257070596c345dd214115aa45ee --- deployment/keystone/keystone-container-puppet.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index cf1e88771c..5862af877c 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -492,18 +492,7 @@ outputs: - 5000 - 13000 - {get_param: [EndpointMap, KeystoneAdmin, port]} - keystone::admin_bind_host: - str_replace: - template: - "%{hiera('fqdn_$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]} - keystone::public_bind_host: - str_replace: - template: - "%{hiera('fqdn_$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, KeystonePublicApiNetwork]} + keystone::public_endpoint: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]} # NOTE: bind IP is found in hiera replacing the network name with the # local node IP for the given network; replacement examples # (eg. for internal_api):