Refs #29664: Update Candlepin port to new default

theforeman · Jun 5, 2020 · ae1dd65 · ae1dd65
1 parent 6b0c9b4
commit ae1dd65
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp
@@ -36,6 +36,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
@@ -33,7 +33,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 = '9443',
+  Stdlib::HTTPSUrl $candlepin_url = "https://${candlepin_host}:${candlepin_port}/candlepin",
   String[1] $postgresql_debversion_package = $katello::globals::postgresql_debversion_package,
   String[1] $postgresql_evr_package = $katello::globals::postgresql_evr_package,
 ) inherits katello::globals {

diff --git a/spec/classes/application_spec.rb b/spec/classes/application_spec.rb
@@ -74,7 +74,7 @@ class { 'katello::params':
             '    :docker: true',
             '    :ostree: false',
             '  :candlepin:',
-            '    :url: https://localhost:8443/candlepin',
+            '    :url: https://localhost:9443/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:9443/candlepin',
             '    :oauth_key: "katello"',
             '    :oauth_secret: "candlepin-secret"',
             '    :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt',
@@ -182,7 +182,7 @@ class {'katello::globals':
             '    :docker: true',
             '    :ostree: true',
             '  :candlepin:',
-            '    :url: https://localhost:8443/candlepin',
+            '    :url: https://localhost:9443/candlepin',
             '    :oauth_key: "katello"',
             '    :oauth_secret: "candlepin-secret"',
             '    :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt',