Use CONTENT_ORIGIN instead of CONTENT_HOST

pulpcore changed the setting name from CONTENT_HOST to CONTENT_ORIGIN. Required PR: pulp/pulpcore#370 Required PR: pulp/pulp-smash#1227 https://pulp.plan.io/issues/5629 re #5629
pulp · Nov 8, 2019 · e8a9176 · e8a9176
1 parent b32e6b6
commit e8a9176
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 44 deletions.
diff --git a/.travis/playbook.yml b/.travis/playbook.yml
diff --git a/.travis/post_before_install.sh b/.travis/post_before_install.sh
diff --git a/CHANGES/5629.misc b/CHANGES/5629.misc
@@ -0,0 +1 @@
+Switch to using ``CONTENT_ORIGIN`` instead of ``CONTENT_HOST`` due to core changing the name.
diff --git a/docs/workflows/distribution.rst b/docs/workflows/distribution.rst
@@ -10,7 +10,7 @@ Create a Distribution for Repository 'foo'
 
 This will distribute the 'latest' RepositoryVersion always which makes it consumable by
 ``ansible-galaxy`` client. Users create a Distribution which will serve the RepositoryVersion
-content at ``$CONTENT_HOST/pulp/content/<distribution.base_path>`` as demonstrated in the
+content at ``$CONTENT_ORIGIN/pulp/content/<distribution.base_path>`` as demonstrated in the
 :ref:`ansible-galaxy usage documentation<ansible-galaxy-cli>`.
 
 .. literalinclude:: ../_scripts/distribution_repo.sh

diff --git a/pulp_ansible/app/galaxy/serializers.py b/pulp_ansible/app/galaxy/serializers.py
@@ -40,8 +40,8 @@ def get_source(self, obj):
         """
         Get source.
         """
-        if settings.CONTENT_HOST:
-            host = settings.CONTENT_HOST
+        if settings.CONTENT_ORIGIN:
+            host = settings.CONTENT_ORIGIN
         else:
             host = self.context["request"].get_host()
         host = "{}://{}".format(self.context["request"].scheme, host)

diff --git a/pulp_ansible/app/galaxy/v3/serializers.py b/pulp_ansible/app/galaxy/v3/serializers.py
@@ -181,7 +181,7 @@ def get_download_url(self, obj):
         """
         Get artifact download URL.
         """
-        host = settings.CONTENT_HOST.strip("/")
+        host = settings.CONTENT_ORIGIN.strip("/")
         prefix = settings.CONTENT_PATH_PREFIX.strip("/")
         base_path = self.context["content_artifact"].relative_path.lstrip("/")
         return f"{host}/{prefix}/{base_path}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Switch to using ``CONTENT_ORIGIN`` instead of ``CONTENT_HOST`` due to core changing the name.