openstack
/
puppet-panko
Code Issues Proposed changes

Fix the default port for Panko API 

The port used for Panko in the puppet module is conflicts with Trove[1].
According to the official documentation[2] this should be 8777. The
8777 port has been occupied by ceilometer. So set the panko api port to
8977.

[1]https://github.com/openstack/trove/blob/master/etc/apache2/trove#L20
[2]https://docs.openstack.org/developer/panko/install/manual.html#installing-the-api-server

Change-Id: I53b286d1d6466b574fdb286cc45f3138f96dff59
Closes-Bug: #1691283
This commit is contained in:
ZhongShengping 2017-06-07 09:16:42 +08:00
parent b884e37f65
commit b33c632332
8 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@ -16,7 +16,7 @@
# #
# [*port*] # [*port*]
# (optional) The panko api port. # (optional) The panko api port.
# Defaults to 8041 # Defaults to 8977
# #
# [*workers*] # [*workers*]
# (optional) Number of workers for Panko API server. # (optional) Number of workers for Panko API server.
@ -76,7 +76,7 @@ class panko::api (
$enabled = true, $enabled = true,
$package_ensure = 'present', $package_ensure = 'present',
$host = '0.0.0.0', $host = '0.0.0.0',
$port = '8779', $port = '8977',
$workers = $::os_workers, $workers = $::os_workers,
$max_limit = 1000, $max_limit = 1000,
$service_name = $::panko::params::api_service_name, $service_name = $::panko::params::api_service_name,

18
manifests/keystone/auth.pp
View File

@ -42,22 +42,22 @@
# Default to 'OpenStack Event Service' # Default to 'OpenStack Event Service'
# #
# [*public_url*] # [*public_url*]
# (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:8779') # (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:8977')
# This url should *not* contain any trailing '/'. # This url should *not* contain any trailing '/'.
# #
# [*admin_url*] # [*admin_url*]
# (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:8779') # (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:8977')
# This url should *not* contain any trailing '/'. # This url should *not* contain any trailing '/'.
# #
# [*internal_url*] # [*internal_url*]
# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:8779') # (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:8977')
# #
# === Examples: # === Examples:
# #
# class { 'panko::keystone::auth': # class { 'panko::keystone::auth':
# public_url => 'https://10.0.0.10:8779', # public_url => 'https://10.0.0.10:8977',
# internal_url => 'https://10.0.0.11:8779', # internal_url => 'https://10.0.0.11:8977',
# admin_url => 'https://10.0.0.11:8779', # admin_url => 'https://10.0.0.11:8977',
# } # }
# #
@ -73,9 +73,9 @@ class panko::keystone::auth (
$service_description = 'OpenStack Event Service', $service_description = 'OpenStack Event Service',
$service_type = 'event', $service_type = 'event',
$region = 'RegionOne', $region = 'RegionOne',
$public_url = 'http://127.0.0.1:8779', $public_url = 'http://127.0.0.1:8977',
$admin_url = 'http://127.0.0.1:8779', $admin_url = 'http://127.0.0.1:8977',
$internal_url = 'http://127.0.0.1:8779', $internal_url = 'http://127.0.0.1:8977',
) { ) {
include ::panko::deps include ::panko::deps

4
manifests/wsgi/apache.pp
View File

@ -27,7 +27,7 @@
# #
# [*port*] # [*port*]
# The port. # The port.
# Optional. Defaults to 8779 # Optional. Defaults to 8977
# #
# [*bind_host*] # [*bind_host*]
# The host/ip address Apache will listen on. # The host/ip address Apache will listen on.
@ -79,7 +79,7 @@
# #
class panko::wsgi::apache ( class panko::wsgi::apache (
$servername = $::fqdn, $servername = $::fqdn,
$port = 8779, $port = 8977,
$bind_host = undef, $bind_host = undef,
$path = '/', $path = '/',
$ssl = true, $ssl = true,

3
releasenotes/notes/fix-api-port-default-871345e935f23439.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- Set the default api port to 8977.

2
spec/acceptance/basic_panko_spec.rb
View File

@ -56,7 +56,7 @@ describe 'basic panko' do
end end
if os[:family].casecmp('RedHat') == 0 if os[:family].casecmp('RedHat') == 0
describe port(8779) do describe port(8977) do
it { is_expected.to be_listening } it { is_expected.to be_listening }
end end
end end

2
spec/classes/panko_api_spec.rb
View File

@ -14,7 +14,7 @@ describe 'panko::api' do
{ :enabled => true, { :enabled => true,
:manage_service => true, :manage_service => true,
:package_ensure => 'latest', :package_ensure => 'latest',
:port => '8779', :port => '8977',
:max_limit => '1000', :max_limit => '1000',
:host => '0.0.0.0', :host => '0.0.0.0',
:max_retries => '10', :max_retries => '10',

6
spec/classes/panko_keystone_auth_spec.rb
View File

@ -29,9 +29,9 @@ describe 'panko::keystone::auth' do
it { is_expected.to contain_keystone_endpoint('RegionOne/panko::event').with( it { is_expected.to contain_keystone_endpoint('RegionOne/panko::event').with(
:ensure => 'present', :ensure => 'present',
:public_url => 'http://127.0.0.1:8779', :public_url => 'http://127.0.0.1:8977',
:admin_url => 'http://127.0.0.1:8779', :admin_url => 'http://127.0.0.1:8977',
:internal_url => 'http://127.0.0.1:8779', :internal_url => 'http://127.0.0.1:8977',
) } ) }
end end

2
spec/classes/panko_wsgi_apache_spec.rb
View File

@ -31,7 +31,7 @@ describe 'panko::wsgi::apache' do
it { is_expected.to contain_apache__vhost('panko_wsgi').with( it { is_expected.to contain_apache__vhost('panko_wsgi').with(
'servername' => 'some.host.tld', 'servername' => 'some.host.tld',
'ip' => nil, 'ip' => nil,
'port' => '8779', 'port' => '8977',
'docroot' => "#{platform_params[:wsgi_script_path]}", 'docroot' => "#{platform_params[:wsgi_script_path]}",
'docroot_owner' => 'panko', 'docroot_owner' => 'panko',
'docroot_group' => 'panko', 'docroot_group' => 'panko',