Fixes #20857 - override post_sync_url (#211)

theforeman · Sep 7, 2017 · 451530b · 451530b
1 parent 597a07c
commit 451530b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/manifests/application.pp b/manifests/application.pp
@@ -17,11 +17,13 @@
   Optional[String] $proxy_username = $::katello::proxy_username,
   Optional[String] $proxy_password = $::katello::proxy_password,
 ) {
+  include ::foreman
   include ::certs
   include ::certs::apache
   include ::certs::foreman
   include ::certs::pulp_client
 
+  $post_sync_url = "${::foreman::foreman_url}${deployment_url}/api/v2/repositories/sync_complete?token=${post_sync_token}"
   $candlepin_ca_cert = $::certs::ca_cert
   $pulp_ca_cert = $::certs::katello_server_ca_cert
 
@@ -45,7 +47,6 @@
     mode   => '0644',
   }
 
-  include ::foreman
   include ::foreman::plugin::tasks
 
   Class['certs', 'certs::ca', 'certs::apache'] ~> Class['apache::service']

diff --git a/templates/katello.yaml.erb b/templates/katello.yaml.erb
@@ -7,7 +7,7 @@
   <%- end -%>
   :rest_client_timeout: 3600
 
-  :post_sync_url: https://<%= @fqdn %><%= @deployment_url %>/api/v2/repositories/sync_complete?token=<%= @post_sync_token %>
+  :post_sync_url: <%= @post_sync_url %>
 
   :candlepin:
     :url: <%= @candlepin_url %>