Fixes #35390 - set ANSIBLE_API_HOSTNAME *with* scheme

Fixes: 17a84f3 Fixes: 6ed8be4 See https://github.com/pulp/pulp_ansible/blob/0.13/docs/settings.rst#ansible_api_hostname
theforeman · Aug 22, 2022 · 5858c93 · 5858c93
1 parent 977a4d3
commit 5858c93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/manifests/plugin/ansible.pp b/manifests/plugin/ansible.pp
@@ -19,12 +19,14 @@
     fail('HTTPS must be turned on for Ansible content')
   } elsif $pulpcore::apache::https_port != 443 {
     $external_content_url = "https://${pulpcore::servername}:${pulpcore::apache::https_port}${pulpcore::apache::content_path}"
+    $external_api_url = "https://${pulpcore::servername}:${pulpcore::apache::https_port}"
   } else {
     $external_content_url = "https://${pulpcore::servername}${pulpcore::apache::content_path}"
+    $external_api_url = "https://${pulpcore::servername}"
   }
 
   pulpcore::plugin { 'ansible':
-    config        => "ANSIBLE_API_HOSTNAME = \"${pulpcore::servername}\"\nANSIBLE_CONTENT_HOSTNAME = \"${external_content_url}\"",
+    config        => "ANSIBLE_API_HOSTNAME = \"${external_api_url}\"\nANSIBLE_CONTENT_HOSTNAME = \"${external_content_url}\"",
     https_content => epp('pulpcore/apache-fragment.epp', $context),
   }
 }
diff --git a/spec/classes/plugin_ansible_spec.rb b/spec/classes/plugin_ansible_spec.rb
@@ -24,7 +24,7 @@
         is_expected.to contain_apache__vhost__fragment('pulpcore-https-plugin-ansible')
                            .with_content(expected_vhost_content)
         is_expected.to contain_concat__fragment('plugin-ansible')
-          .with_content(/^ANSIBLE_API_HOSTNAME = "foo.example.com"/)
+          .with_content(%r{^ANSIBLE_API_HOSTNAME = "https://foo.example.com"})
           .with_content(%r{^ANSIBLE_CONTENT_HOSTNAME = "https://foo.example.com/pulp/content"})
       end
     end