diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp index ad21dd4b..92749553 100644 --- a/manifests/candlepin.pp +++ b/manifests/candlepin.pp @@ -37,6 +37,7 @@ class { 'candlepin': host => $katello::params::candlepin_host, + ssl_port => $katello::params::candlepin_port, user_groups => $certs::candlepin::group, oauth_key => $katello::params::candlepin_oauth_key, oauth_secret => $katello::params::candlepin_oauth_secret, diff --git a/manifests/params.pp b/manifests/params.pp index 14720726..200210f9 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -31,7 +31,8 @@ String[1] $candlepin_oauth_key = $katello::globals::candlepin_oauth_key, String[1] $candlepin_oauth_secret = $katello::globals::candlepin_oauth_secret, Stdlib::Host $candlepin_host = 'localhost', - Stdlib::HTTPSUrl $candlepin_url = "https://${candlepin_host}:8443/candlepin", + Stdlib::Port $candlepin_port = 23443, + Stdlib::HTTPSUrl $candlepin_url = "https://${candlepin_host}:${candlepin_port}/candlepin", String[1] $candlepin_client_keypair_group = 'foreman', String[1] $postgresql_evr_package = $katello::globals::postgresql_evr_package, ) inherits katello::globals { diff --git a/spec/acceptance/candlepin_spec.rb b/spec/acceptance/candlepin_spec.rb index 6202419f..a7b484ee 100644 --- a/spec/acceptance/candlepin_spec.rb +++ b/spec/acceptance/candlepin_spec.rb @@ -10,11 +10,11 @@ it { is_expected.to be_enabled } end - describe port('8443') do + describe port('23443') do it { is_expected.to be_listening } end - describe command('curl -k -s -o /dev/null -w \'%{http_code}\' https://localhost:8443/candlepin/status') do + describe command('curl -k -s -o /dev/null -w \'%{http_code}\' https://localhost:23443/candlepin/status') do its(:stdout) { should eq "200" } end end diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb index 8986b411..d93052a8 100644 --- a/spec/classes/application_spec.rb +++ b/spec/classes/application_spec.rb @@ -72,7 +72,7 @@ class { 'katello::params': ' :docker: true', ' :ostree: false', ' :candlepin:', - ' :url: https://localhost:8443/candlepin', + ' :url: https://localhost:23443/candlepin', ' :oauth_key: "katello"', ' :oauth_secret: "candlepin-secret"', ' :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt', @@ -137,7 +137,7 @@ class { 'katello::params': ' :docker: true', ' :ostree: false', ' :candlepin:', - ' :url: https://localhost:8443/candlepin', + ' :url: https://localhost:23443/candlepin', ' :oauth_key: "katello"', ' :oauth_secret: "candlepin-secret"', ' :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt', @@ -184,7 +184,7 @@ class {'katello::globals': ' :docker: true', ' :ostree: true', ' :candlepin:', - ' :url: https://localhost:8443/candlepin', + ' :url: https://localhost:23443/candlepin', ' :oauth_key: "katello"', ' :oauth_secret: "candlepin-secret"', ' :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt',