fix: Malformed content app URL (ansible#43)

* Use CONTENT_PATH_PREFIX setting from pulpcore to build content app URL. * Fix missing X_PULP_CONTENT_HOST setting for development environment.
newswangerd · Mar 23, 2020 · 63864a8 · 63864a8
1 parent b4042a2
commit 63864a8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/dev/automation-hub/galaxy_ng.env b/dev/automation-hub/galaxy_ng.env
@@ -1,4 +1,3 @@
-PULP_API_PATH_PREFIX=
 PULP_CONTENT_PATH_PREFIX=/api/automation-hub/v3/artifacts/collections/
 
 PULP_GALAXY_API_PATH_PREFIX=/api/automation-hub/

diff --git a/dev/common/galaxy_ng.env b/dev/common/galaxy_ng.env
@@ -7,4 +7,6 @@ PULP_DB_NAME=galaxy_ng
 
 PULP_REDIS_HOST=redis
 
-PULP_CONTENT_ORIGIN="http://localhost:5001"
+PULP_CONTENT_ORIGIN="http://localhost:5001"
+
+PULP_X_PULP_CONTENT_HOST=content-app
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
@@ -51,6 +51,8 @@ services:
   content-app:
     image: "localhost/${COMPOSE_PROJECT_NAME}/galaxy_ng:latest"
     command: ['run', 'content-app']
+    ports:
+      - "24816:24816"
     env_file:
       - './common/galaxy_ng.env'
       - './automation-hub/galaxy_ng.env'

diff --git a/galaxy_ng/app/api/v3/viewsets.py b/galaxy_ng/app/api/v3/viewsets.py
@@ -285,7 +285,7 @@ def get(self, request, *args, **kwargs):
         url = 'http://{host}:{port}/{prefix}/automation-hub/{filename}'.format(
             host=settings.X_PULP_CONTENT_HOST,
             port=settings.X_PULP_CONTENT_PORT,
-            prefix=settings.X_PULP_CONTENT_PATH_PREFIX.strip('/'),
+            prefix=settings.CONTENT_PATH_PREFIX.strip('/'),
             filename=self.kwargs['filename'],
         )
         response = requests.get(url, stream=True, allow_redirects=False)

diff --git a/galaxy_ng/app/settings.py b/galaxy_ng/app/settings.py
@@ -32,6 +32,5 @@
 X_PULP_API_PASSWORD = "admin"
 X_PULP_API_PREFIX = "pulp_ansible/galaxy/automation-hub/api"
 
-X_PULP_CONTENT_HOST = "pulp-content"
+X_PULP_CONTENT_HOST = "localhost"
 X_PULP_CONTENT_PORT = 24816
-X_PULP_CONTENT_PATH_PREFIX = f"/{GALAXY_API_PATH_PREFIX}/v3/artifacts/collections/"