diff options
| author | chouseknecht <chouse@ansible.com> | 2015-12-09 22:56:54 -0500 |
|---|---|---|
| committer | chouseknecht <chouseknecht@ansible.com> | 2015-12-13 05:23:04 -0500 |
| commit | 342dee0023e2c6fd6d361a70fec621c09b833915 (patch) | |
| tree | e5f94ea33cb7263f9a5c3ce2f29d7fd89ec2e34c /lib/ansible/galaxy | |
| parent | f1c72ff8f51b749165d5bc4089ca8c8fd5b22789 (diff) | |
| download | ansible-342dee0023e2c6fd6d361a70fec621c09b833915.tar.gz | |
Define and handle ignore_certs correctly. Preserve search term order. Tweak to Galaxy docsite.
Diffstat (limited to 'lib/ansible/galaxy')
| -rw-r--r-- | lib/ansible/galaxy/api.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/ansible/galaxy/api.py b/lib/ansible/galaxy/api.py index c1bf2c4ed5..eec9ee932e 100644 --- a/lib/ansible/galaxy/api.py +++ b/lib/ansible/galaxy/api.py @@ -48,16 +48,15 @@ class GalaxyAPI(object): SUPPORTED_VERSIONS = ['v1'] def __init__(self, galaxy): - self.galaxy = galaxy self.token = GalaxyToken() self._api_server = C.GALAXY_SERVER - self._validate_certs = C.GALAXY_IGNORE_CERTS + self._validate_certs = not C.GALAXY_IGNORE_CERTS # set validate_certs - if galaxy.options.validate_certs == False: + if galaxy.options.ignore_certs: self._validate_certs = False - display.vvv('Check for valid certs: %s' % self._validate_certs) + display.vvv('Validate TLS certificates: %s' % self._validate_certs) # set the API server if galaxy.options.api_server != C.GALAXY_SERVER: @@ -65,14 +64,13 @@ class GalaxyAPI(object): display.vvv("Connecting to galaxy_server: %s" % self._api_server) server_version = self.get_server_api_version() - - if server_version in self.SUPPORTED_VERSIONS: - self.baseurl = '%s/api/%s' % (self._api_server, server_version) - self.version = server_version # for future use - display.vvv("Base API: %s" % self.baseurl) - else: + if not server_version in self.SUPPORTED_VERSIONS: raise AnsibleError("Unsupported Galaxy server API version: %s" % server_version) + self.baseurl = '%s/api/%s' % (self._api_server, server_version) + self.version = server_version # for future use + display.vvv("Base API: %s" % self.baseurl) + def __auth_header(self): token = self.token.get() if token is None: |