diff --git a/manifests/wsgi/apache_api.pp b/manifests/wsgi/apache_api.pp index 53fafe22e..1c9c8abb6 100644 --- a/manifests/wsgi/apache_api.pp +++ b/manifests/wsgi/apache_api.pp @@ -121,12 +121,6 @@ # directives to be placed at the end of the vhost configuration. # Defaults to undef. # -# DEPRECATED PARAMETERS -# -# [*api_port*] -# (Optional) The port for Nova API service. -# Defaults to 8774 -# # == Dependencies # # requires Class['apache'] & Class['nova'] & Class['nova::api'] @@ -165,8 +159,6 @@ class nova::wsgi::apache_api ( $headers = undef, $request_headers = undef, $vhost_custom_fragment = undef, - # DEPRECATED PARAMETERS - $api_port = undef, ) { include nova::params @@ -175,13 +167,9 @@ class nova::wsgi::apache_api ( fail('::nova::api class must be declared in composition layer.') } - if $api_port { - warning('The api_port parameter is deprecated. Use the port parameter') - } - ::openstacklib::wsgi::apache { 'nova_api_wsgi': bind_host => $bind_host, - bind_port => pick($api_port, $port), + bind_port => $port, group => $::nova::params::group, path => $path, priority => $priority, diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp index dbc0f0465..80cc6fb86 100644 --- a/manifests/wsgi/apache_metadata.pp +++ b/manifests/wsgi/apache_metadata.pp @@ -125,12 +125,6 @@ # directives to be placed at the end of the vhost configuration. # Defaults to undef. # -# DEPRECATED PARAMETERS -# -# [*api_port*] -# (Optional) The port for Nova API service. -# Defaults to 8775 -# # == Dependencies # # requires Class['apache'] & Class['nova'] & Class['nova::metadata'] @@ -170,8 +164,6 @@ class nova::wsgi::apache_metadata ( $headers = undef, $request_headers = undef, $vhost_custom_fragment = undef, - # DEPRECATED PARAMETERS - $api_port = undef, ) { include nova::params @@ -188,13 +180,9 @@ class nova::wsgi::apache_metadata ( Service <| title == 'httpd' |> { tag +> 'nova-service' } - if $api_port { - warning('The api_port parameter is deprecated. Use the port parameter') - } - ::openstacklib::wsgi::apache { 'nova_metadata_wsgi': bind_host => $bind_host, - bind_port => pick($api_port, $port), + bind_port => $port, group => $::nova::params::group, path => $path, priority => $priority, diff --git a/releasenotes/notes/remove-api_port-09f5fd1769c94ae7.yaml b/releasenotes/notes/remove-api_port-09f5fd1769c94ae7.yaml new file mode 100644 index 000000000..8de5945f4 --- /dev/null +++ b/releasenotes/notes/remove-api_port-09f5fd1769c94ae7.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The following parameters were removed, in favor of the new ``port`` + parameters. + + - ``nova::wsgi::apache_api::api_port`` + - ``nova::wsgi::apache_metadata::api_port``