Derive ANSIBLE_CONTENT_HOSTNAME from CONTENT_ORIGIN

https://pulp.plan.io/issues/7368 closes #7368
pulp · Oct 5, 2020 · 02c1ffb · 02c1ffb
1 parent 787953b
commit 02c1ffb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES/7368.removal b/CHANGES/7368.removal
@@ -0,0 +1 @@
+Derive ANSIBLE_CONTENT_HOSTNAME from CONTENT_ORIGIN
diff --git a/docs/settings.rst b/docs/settings.rst
@@ -21,9 +21,9 @@ ANSIBLE_CONTENT_HOSTNAME
    The origin, e.g. "http://example.com" that will instruct the client how to find the Pulp content
    app. This URL is formed in various Galaxy APIs (V1, V2, V3) responses.
 
-   This defaults to http on your fqdn, which is usable with the Ansible installer's default Nginx
-   configuration. By default it includes the ``pulp/content`` subpath. So if `example.com` is your
-   fqdn, this would default to "http://example.com/pulp/content".
+   This defaults to `CONTENT_ORIGIN <https://docs.pulpproject.org/pulpcore/settings.html?#content-origin>`_.
+   By default it includes the ``pulp/content`` subpath. So if `https://example.com` is your
+   CONTENT_ORIGIN, this would default to "https://example.com/pulp/content".
 
 
 GALAXY_API_ROOT

diff --git a/pulp_ansible/app/settings.py b/pulp_ansible/app/settings.py
@@ -1,5 +1,6 @@
 import socket
 
+from dynaconf import settings
 
 LOGGING = {
     "loggers": {
@@ -20,4 +21,4 @@
 }
 
 ANSIBLE_API_HOSTNAME = "http://" + socket.getfqdn()
-ANSIBLE_CONTENT_HOSTNAME = "http://" + socket.getfqdn() + "/pulp/content"
+ANSIBLE_CONTENT_HOSTNAME = settings.CONTENT_ORIGIN + "/pulp/content"