From b33c63233286c8bb4be73f8da9d7fc7ef944a4a9 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 7 Jun 2017 09:16:42 +0800 Subject: [PATCH] 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 --- manifests/api.pp | 4 ++-- manifests/keystone/auth.pp | 18 +++++++++--------- manifests/wsgi/apache.pp | 4 ++-- .../fix-api-port-default-871345e935f23439.yaml | 3 +++ spec/acceptance/basic_panko_spec.rb | 2 +- spec/classes/panko_api_spec.rb | 2 +- spec/classes/panko_keystone_auth_spec.rb | 6 +++--- spec/classes/panko_wsgi_apache_spec.rb | 2 +- 8 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 releasenotes/notes/fix-api-port-default-871345e935f23439.yaml diff --git a/manifests/api.pp b/manifests/api.pp index dc1ec8c..0f16667 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -16,7 +16,7 @@ # # [*port*] # (optional) The panko api port. -# Defaults to 8041 +# Defaults to 8977 # # [*workers*] # (optional) Number of workers for Panko API server. @@ -76,7 +76,7 @@ class panko::api ( $enabled = true, $package_ensure = 'present', $host = '0.0.0.0', - $port = '8779', + $port = '8977', $workers = $::os_workers, $max_limit = 1000, $service_name = $::panko::params::api_service_name, diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index ebd35a4..e93ef29 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -42,22 +42,22 @@ # Default to 'OpenStack Event Service' # # [*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 '/'. # # [*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 '/'. # # [*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: # # class { 'panko::keystone::auth': -# public_url => 'https://10.0.0.10:8779', -# internal_url => 'https://10.0.0.11:8779', -# admin_url => 'https://10.0.0.11:8779', +# public_url => 'https://10.0.0.10:8977', +# internal_url => 'https://10.0.0.11:8977', +# admin_url => 'https://10.0.0.11:8977', # } # @@ -73,9 +73,9 @@ class panko::keystone::auth ( $service_description = 'OpenStack Event Service', $service_type = 'event', $region = 'RegionOne', - $public_url = 'http://127.0.0.1:8779', - $admin_url = 'http://127.0.0.1:8779', - $internal_url = 'http://127.0.0.1:8779', + $public_url = 'http://127.0.0.1:8977', + $admin_url = 'http://127.0.0.1:8977', + $internal_url = 'http://127.0.0.1:8977', ) { include ::panko::deps diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 0a558fc..d6d32a2 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -27,7 +27,7 @@ # # [*port*] # The port. -# Optional. Defaults to 8779 +# Optional. Defaults to 8977 # # [*bind_host*] # The host/ip address Apache will listen on. @@ -79,7 +79,7 @@ # class panko::wsgi::apache ( $servername = $::fqdn, - $port = 8779, + $port = 8977, $bind_host = undef, $path = '/', $ssl = true, diff --git a/releasenotes/notes/fix-api-port-default-871345e935f23439.yaml b/releasenotes/notes/fix-api-port-default-871345e935f23439.yaml new file mode 100644 index 0000000..1d39dc7 --- /dev/null +++ b/releasenotes/notes/fix-api-port-default-871345e935f23439.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Set the default api port to 8977. diff --git a/spec/acceptance/basic_panko_spec.rb b/spec/acceptance/basic_panko_spec.rb index 8ff71a1..22f1b8f 100644 --- a/spec/acceptance/basic_panko_spec.rb +++ b/spec/acceptance/basic_panko_spec.rb @@ -56,7 +56,7 @@ describe 'basic panko' do end if os[:family].casecmp('RedHat') == 0 - describe port(8779) do + describe port(8977) do it { is_expected.to be_listening } end end diff --git a/spec/classes/panko_api_spec.rb b/spec/classes/panko_api_spec.rb index 05e8ab8..2a2fc33 100644 --- a/spec/classes/panko_api_spec.rb +++ b/spec/classes/panko_api_spec.rb @@ -14,7 +14,7 @@ describe 'panko::api' do { :enabled => true, :manage_service => true, :package_ensure => 'latest', - :port => '8779', + :port => '8977', :max_limit => '1000', :host => '0.0.0.0', :max_retries => '10', diff --git a/spec/classes/panko_keystone_auth_spec.rb b/spec/classes/panko_keystone_auth_spec.rb index d1f4fcb..b974507 100644 --- a/spec/classes/panko_keystone_auth_spec.rb +++ b/spec/classes/panko_keystone_auth_spec.rb @@ -29,9 +29,9 @@ describe 'panko::keystone::auth' do it { is_expected.to contain_keystone_endpoint('RegionOne/panko::event').with( :ensure => 'present', - :public_url => 'http://127.0.0.1:8779', - :admin_url => 'http://127.0.0.1:8779', - :internal_url => 'http://127.0.0.1:8779', + :public_url => 'http://127.0.0.1:8977', + :admin_url => 'http://127.0.0.1:8977', + :internal_url => 'http://127.0.0.1:8977', ) } end diff --git a/spec/classes/panko_wsgi_apache_spec.rb b/spec/classes/panko_wsgi_apache_spec.rb index 21d3da2..98a7843 100644 --- a/spec/classes/panko_wsgi_apache_spec.rb +++ b/spec/classes/panko_wsgi_apache_spec.rb @@ -31,7 +31,7 @@ describe 'panko::wsgi::apache' do it { is_expected.to contain_apache__vhost('panko_wsgi').with( 'servername' => 'some.host.tld', 'ip' => nil, - 'port' => '8779', + 'port' => '8977', 'docroot' => "#{platform_params[:wsgi_script_path]}", 'docroot_owner' => 'panko', 'docroot_group' => 'panko',