openstack/puppet-placement
Code Issues Proposed changes

httpd+mod_wsgi: Update default port and path

Browse Source 
This is a follow-up of d7b8c158f989f3ac7846ee3d935df39e8533cf10 and
updates default port and path used when placement-api is hosted by
httpd+mod_wsgi.

Depends-on: https://review.opendev.org/819051
Change-Id: I7b2ae0deb0b7f1675682e89f70ac8f13ab5563bf
This commit is contained in:
Takashi Kajinami 2021-11-24 13:21:25 +09:00 committed by Tobias Urdin
parent 467c0b0a4d
commit d191895eea
5 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/keystone/auth.pp
View File

@ -53,17 +53,17 @@
#
# [*public_url*]
# (Optional) The endpoint's public url.
# Defaults to 'http://127.0.0.1/placement'
# Defaults to 'http://127.0.0.1:8778'
# This url should *not* contain any trailing '/'.
#
# [*admin_url*]
# (Optional) The endpoint's admin url.
# Defaults to 'http://127.0.0.1/placement'
# Defaults to 'http://127.0.0.1:8778'
# This url should *not* contain any trailing '/'.
#
# [*internal_url*]
# (Optional) The endpoint's internal url.
# Defaults to 'http://127.0.0.1/placement'
# Defaults to 'http://127.0.0.1:8778'
#
class placement::keystone::auth (
$password,
@ -78,9 +78,9 @@ class placement::keystone::auth (
$service_description = 'Placement Service',
$service_type = 'placement',
$region = 'RegionOne',
$public_url = 'http://127.0.0.1/placement',
$admin_url = 'http://127.0.0.1/placement',
$internal_url = 'http://127.0.0.1/placement',
$public_url = 'http://127.0.0.1:8778',
$admin_url = 'http://127.0.0.1:8778',
$internal_url = 'http://127.0.0.1:8778',
) {
include placement::deps

16
manifests/wsgi/apache.pp
View File

@ -28,7 +28,7 @@
#
# [*api_port*]
# (Optional) The port for Placement API service.
# Defaults to 80
# Defaults to 8778
#
# [*bind_host*]
# (Optional) The host/ip address Apache will listen on.
@ -36,7 +36,7 @@
#
# [*path*]
# (Optional) The prefix for the endpoint.
# Defaults to '/placement'
# Defaults to '/'
#
# [*ssl*]
# (Optional) Use ssl ? (boolean)
@ -99,9 +99,9 @@
#
class placement::wsgi::apache (
$servername = $::fqdn,
$api_port = 80,
$api_port = 8778,
$bind_host = undef,
$path = '/placement',
$path = '/',
$ssl = undef,
$workers = $::os_workers,
$priority = '10',
@ -122,14 +122,6 @@ class placement::wsgi::apache (
$ensure_package = undef,
) {
if $api_port == 80 {
warning('The default api_port will be changed from 80 to 8778 in a future release.')
}
if $path == '/placement' {
warning('The default path will be changed from /placement to / in a future release.')
}
if $ssl == undef {
warning('Default of the ssl parameter will be changed in a future release')
}

10
releasenotes/notes/update-wsgi-default-port-and-path-d2c07a1d28215d0d.yaml Normal file
View File

@ -0,0 +1,10 @@
---
upgrade:
- |
Default values of the following parameters have been changed, so that
the consistent endpoint url is used by default. Also, default values of
the ``placement::keystone::auth::*_url`` parameters have been updated
accordingly.
- ``placement::wsgi::api_port``: ``80`` to ``8787``
- ``placement::wsgi::path``: ``/placement`` to ``/``

6
spec/classes/placement_keystone_auth_spec.rb
View File

@ -23,9 +23,9 @@ describe 'placement::keystone::auth' do
:password => 'placement_password',
:email => 'placement@localhost',
:tenant => 'services',
:public_url => 'http://127.0.0.1/placement',
:internal_url => 'http://127.0.0.1/placement',
:admin_url => 'http://127.0.0.1/placement',
:public_url => 'http://127.0.0.1:8778',
:internal_url => 'http://127.0.0.1:8778',
:admin_url => 'http://127.0.0.1:8778',
) }
end

4
spec/classes/placement_wsgi_apache.rb
View File

@ -14,9 +14,9 @@ describe 'placement::wsgi::apache' do
it { should contain_openstacklib__wsgi__apache('placement_wsgi').with(
:bind_host => nil,
:bind_port => 80,
:bind_port => 8778,
:group => 'placement',
:path => '/placement',
:path => '/',
:priority => '10',
:servername => facts[:fqdn],
:ssl => true,