Merge pull request #450 from ipanova/content-origin

Remove content_origin and let pulp-operator auto set it.
pulp · Nov 8, 2019 · c183c78 · c183c78
2 parents 0b0629d + f39bea4
commit c183c78
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -96,7 +96,6 @@ spec:
     password: pulp
     admin_password: pulp
   pulp_settings:
-     content_host: $(hostname):24816
      token_server: $(hostname):24816/token
      private_key_path: /var/lib/pulp/tmp/private.pem
      public_key_path: /var/lib/pulp/tmp/public.pem

diff --git a/pulp_docker/app/authorization.py b/pulp_docker/app/authorization.py
@@ -16,7 +16,7 @@
 
 TOKEN_EXPIRATION_TIME = 300
 
-KNOWN_SERVICES = [settings.CONTENT_HOST]
+KNOWN_SERVICES = [settings.CONTENT_ORIGIN]
 ANONYMOUS_USER = ''
 EMPTY_ACCESS_SCOPE = '::'
 

diff --git a/pulp_docker/app/serializers.py b/pulp_docker/app/serializers.py
@@ -107,10 +107,7 @@ def to_representation(self, value):
         """
         Converts a base_path into a registry path.
         """
-        if settings.CONTENT_HOST:
-            host = settings.CONTENT_HOST
-        else:
-            host = self.context['request'].get_host()
+        host = settings.CONTENT_ORIGIN
         return ''.join([host, '/', value])
 
 

diff --git a/pulp_docker/app/token_verification.py b/pulp_docker/app/token_verification.py
@@ -98,7 +98,7 @@ def _build_authenticate_string(self, source_path):
         realm="https://token",service="docker.io",scope="repository:my-app:push".
         """
         realm = f'{self.request.scheme}://{settings.TOKEN_SERVER}'
-        authenticate_string = f'Bearer realm="{realm}",service="{settings.CONTENT_HOST}"'
+        authenticate_string = f'Bearer realm="{realm}",service="{settings.CONTENT_ORIGIN}"'
 
         if not self._is_verifying_root_endpoint():
             scope = f'repository:{source_path}:pull'
@@ -132,7 +132,7 @@ def _init_jwt_decoder_config(self):
         return {
             'algorithms': [settings.TOKEN_SIGNATURE_ALGORITHM],
             'issuer': settings.TOKEN_SERVER,
-            'audience': settings.CONTENT_HOST
+            'audience': settings.CONTENT_ORIGIN
         }
 
     def contains_accessible_actions(self, decoded_token):

diff --git a/template_config.yml b/template_config.yml
@@ -35,7 +35,6 @@ plugin_name: pulp_docker
 plugin_snake: pulp_docker
 plugin_snake_short: docker
 pulp_settings:
-  content_host: $(hostname):24816
   token_server: $(hostname):24816/token
   token_signature_algorithm: ES256
 pydocstyle: true