Merge aa9cbada69 into 6aa8192131

changelogs/fragments/ansible-galaxy-fix-tokenfile-creation.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - ansible-galaxy - avoid creating the ``GALAXY_TOKEN_PATH`` as a side effect of configured servers that don't use ``username``/``password`` or ``auth_url`` for authentication.

lib/ansible/cli/galaxy.py

@@ -695,7 +695,7 @@ class GalaxyCLI(CLI):
                                                                 client_id=client_id)
                     else:
                         # The galaxy v1 / github / django / 'Token'
-                        server_options['token'] = GalaxyToken(token=token_val)
+                        server_options['token'] = GalaxyToken(token=token_val, config={})
 
             server_options.update(galaxy_options)
             config_servers.append(GalaxyAPI(

lib/ansible/galaxy/token.py

@@ -102,10 +102,10 @@ class GalaxyToken(object):
 
     token_type = 'Token'
 
-    def __init__(self, token=None):
+    def __init__(self, token=None, config=None):
         self.b_file = to_bytes(C.GALAXY_TOKEN_PATH, errors='surrogate_or_strict')
         # Done so the config file is only opened when set/get/save is called
-        self._config = None
+        self._config = config
         self._token = token
 
     @property