From 2a5262051830933be06c12269a5ea25565bb0413 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 24 Aug 2022 02:54:29 +0900 Subject: [PATCH] Remove redundant override of vhost tcp port The latest puppetlabs-apache release (8.0.0) introduced stricter type validations and a string value is no longer accepted for the apache::vhost::port parameter. Because of this change we are no longer able to use string values for *::wsgi::*::api_port parameters. Because the values currently defined in templates are exactly same as the default values defined in underlying puppet modules (puppet-nova and puppet-placement), we can just remove these overrides and use the puppet default values, which are compliant with the new type validations. Closes-Bug: #1987429 Change-Id: I48ad8babf694634bc1107402fd729bdc39fc109e --- deployment/nova/nova-metadata-container-puppet.yaml | 1 - deployment/placement/placement-api-container-puppet.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 2d4f87aabf..d8aed67b0f 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -185,7 +185,6 @@ outputs: nova::keystone::authtoken::interface: 'internal' nova::keystone::authtoken::memcache_use_advanced_pool: {get_param: MemcacheUseAdvancedPool} nova::wsgi::apache_metadata::access_log_format: 'forwarded' - nova::wsgi::apache_metadata::api_port: '8775' nova::wsgi::apache_metadata::ssl: {get_param: EnableInternalTLS} nova::metadata::local_metadata_per_cell: {get_param: NovaLocalMetadataPerCell} # NOTE: bind IP is found in Heat replacing the network name with the local node IP diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index adf87d9c75..b82d772efc 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -194,7 +194,6 @@ outputs: - {get_param: Debug} placement::policy::policies: {get_param: PlacementPolicies} placement::wsgi::apache::access_log_format: 'forwarded' - placement::wsgi::apache::api_port: '8778' placement::wsgi::apache::path: '/placement' placement::wsgi::apache::ssl: {get_param: EnableInternalTLS} # NOTE: bind IP is found in hiera replacing the network name with the local node IP