From a1cfb84b50370baee70fa9d178adaf8ee2939da7 Mon Sep 17 00:00:00 2001 From: Justin Sherrill Date: Tue, 17 Dec 2019 11:12:54 -0500 Subject: [PATCH] provide no path for pulp3 api url --- manifests/plugin/pulp/params.pp | 2 +- spec/classes/foreman_proxy__plugin__pulp_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/plugin/pulp/params.pp b/manifests/plugin/pulp/params.pp index ec9eafc8a..b6eac8ce1 100644 --- a/manifests/plugin/pulp/params.pp +++ b/manifests/plugin/pulp/params.pp @@ -11,7 +11,7 @@ $pulp3_enabled = false $pulp3_mirror = false $pulp_url = "https://${::fqdn}/pulp" - $pulp3_api_url = "${pulp_url}/api" + $pulp3_api_url = "https://${::fqdn}" $pulp3_content_url = "${pulp_url}/content" $pulp_dir = '/var/lib/pulp' $pulp_content_dir = '/var/lib/pulp/content' diff --git a/spec/classes/foreman_proxy__plugin__pulp_spec.rb b/spec/classes/foreman_proxy__plugin__pulp_spec.rb index eff40a145..2f069ae68 100644 --- a/spec/classes/foreman_proxy__plugin__pulp_spec.rb +++ b/spec/classes/foreman_proxy__plugin__pulp_spec.rb @@ -54,7 +54,7 @@ verify_exact_contents(catalogue, "#{etc_dir}/foreman-proxy/settings.d/pulp3.yml", [ '---', ':enabled: false', - ":pulp_url: https://#{facts[:fqdn]}/pulp/api", + ":pulp_url: https://#{facts[:fqdn]}", ":content_app_url: https://#{facts[:fqdn]}/pulp/content", ':mirror: false' ]) @@ -68,7 +68,7 @@ pulpnode_enabled: true, pulp3_enabled: true, pulp3_mirror: true, - pulp3_api_url: 'https://pulp3.example.com/pulp/api', + pulp3_api_url: 'https://pulp3.example.com', pulp3_content_url: 'https://pulp3.example.com/pulp/content', pulp_url: 'https://pulp.example.com', pulp_dir: '/tmp/pulp', @@ -123,7 +123,7 @@ verify_exact_contents(catalogue, "#{etc_dir}/foreman-proxy/settings.d/pulp3.yml", [ '---', ':enabled: https', - ':pulp_url: https://pulp3.example.com/pulp/api', + ':pulp_url: https://pulp3.example.com/', ":content_app_url: https://pulp3.example.com/pulp/content", ':mirror: true' ])