Adding pulp3 container registry config

theforeman · Aug 8, 2019 · 74f1a7d · 74f1a7d
1 parent a7651ed
commit 74f1a7d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/manifests/application.pp b/manifests/application.pp
@@ -14,6 +14,7 @@
   String $candlepin_oauth_secret = $katello::candlepin_oauth_secret,
   Stdlib::Httpsurl $pulp_url = $katello::pulp_url,
   Stdlib::Httpsurl $crane_url = $katello::crane_url,
+  Stdlib::HTTPUrl $pulp_registry_url = $katello::pulp_registry_url,
   String $qpid_url = $katello::qpid_url,
   String $candlepin_event_queue = $katello::candlepin_event_queue,
   Optional[String] $proxy_host = $katello::proxy_url,
@@ -32,7 +33,7 @@
 
   $candlepin_ca_cert = $certs::ca_cert
   $pulp_ca_cert = $certs::katello_server_ca_cert
-  $crane_ca_cert = $certs::katello_server_ca_cert
+  $registry_ca_cert_file = $certs::katello_server_ca_cert
 
   foreman_config_entry { 'pulp_client_cert':
     value          => $certs::pulp_client::client_cert,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -46,6 +46,7 @@
   $candlepin_url = "https://${facts['fqdn']}:8443/candlepin"
   $pulp_url      = "https://${facts['fqdn']}/pulp/api/v2/"
   $crane_url  = "https://${facts['fqdn']}:5000"
+  $pulp_registry_url = 'http://localhost:24816'
 
   # database reinitialization flag
   $reset_data = 'NONE'

diff --git a/spec/classes/katello_application_spec.rb b/spec/classes/katello_application_spec.rb
@@ -20,6 +20,7 @@
           :candlepin_oauth_secret => 'candlepin-secret',
           :pulp_url               => 'https://foo.example.com/pulp/api/v2/',
           :crane_url              => 'https://foo.example.com:5000',
+          :pulp_registry_url      => 'http://localhost:24816',
           :qpid_url               => 'amqp:ssl:localhost:5671',
           :candlepin_event_queue  => 'katello_event_queue',
           :proxy_host             => '',
@@ -97,7 +98,8 @@
               '    :subscriptions_queue_address: katello_event_queue',
               '  :container_image_registry:',
               '    :crane_url: https://foo.example.com:5000',
-              '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
+              '    :pulp_registry_url: http://localhost:24816',
+              '    :registry_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
             ])
           end
         end
@@ -141,7 +143,8 @@
               '    :subscriptions_queue_address: katello_event_queue',
               '  :container_image_registry:',
               '    :crane_url: https://foo.example.com:5000',
-              '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
+              '    :pulp_registry_url: http://localhost:24816',
+              '    :registry_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
             ])
           end
         end
@@ -178,7 +181,8 @@
               '    :subscriptions_queue_address: katello_event_queue',
               '  :container_image_registry:',
               '    :crane_url: https://foo.example.com:5000',
-              '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
+              '    :pulp_registry_url: http://localhost:24816',
+              '    :registry_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
             ])
           end
         end
@@ -217,7 +221,8 @@
               '    :subscriptions_queue_address: katello_event_queue',
               '  :container_image_registry:',
               '    :crane_url: https://foo.example.com:5000',
-              '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt',
+              '    :pulp_registry_url: http://localhost:24816',
+              '    :registry_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt',
               '  :cdn_proxy:',
               '    :host: http://myproxy.org',
               '    :port: 8888',
@@ -270,7 +275,8 @@ class {'::katello':
             '    :subscriptions_queue_address: katello_event_queue',
             '  :container_image_registry:',
             '    :crane_url: https://foo.example.com:5000',
-            '    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
+            '    :pulp_registry_url: http://localhost:24816',
+            '    :registry_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt'
           ])
         end
       end

diff --git a/templates/katello.yaml.erb b/templates/katello.yaml.erb
@@ -29,10 +29,10 @@
     :url: <%= @qpid_url %>
     :subscriptions_queue_address: <%= @candlepin_event_queue %>
 
-  # Internal configuration for communication from server to pulp crane service.
   :container_image_registry:
     :crane_url: <%= @crane_url %>
-    :crane_ca_cert_file: <%= @crane_ca_cert %>
+    :pulp_registry_url: <%= @pulp_registry_url %>
+    :registry_ca_cert_file: <%= @registry_ca_cert_file %>
 
 <%- unless [nil, :undefined, :undef, ''].include?(@proxy_host) -%>
   :cdn_proxy: