Define and handle ignore_certs correctly. Preserve search term order. Tweak to Galaxy docsite.

2 files changed, 12 insertions, 14 deletions

diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py
index 1cd936d028..a4a7b915f3 100644
--- a/lib/ansible/cli/galaxy.py
+++ b/lib/ansible/cli/galaxy.py
@@ -127,7 +127,7 @@ class GalaxyCLI(CLI):
         if self.action in ("import","info","init","install","login","search","setup","delete"):
             self.parser.add_option('-s', '--server', dest='api_server', default=C.GALAXY_SERVER,
                 help='The API server destination')
-            self.parser.add_option('-c', '--ignore-certs', action='store_false', dest='validate_certs', default=True,
+            self.parser.add_option('-c', '--ignore-certs', action='store_true', dest='ignore_certs', default=False,
                 help='Ignore SSL certificate validation errors.')
 
         if self.action in ("init","install"):
@@ -505,7 +505,7 @@ class GalaxyCLI(CLI):
             terms = []
             for i in range(len(self.args)):
                terms.append(self.args.pop())
-            search = '+'.join(terms)
+            search = '+'.join(terms[::-1])
 
         if not search and not self.options.platforms and not self.options.tags and not self.options.author:
             raise AnsibleError("Invalid query. At least one search term, platform, galaxy tag or author must be provided.")
@@ -520,9 +520,9 @@ class GalaxyCLI(CLI):
         data = ''
 
         if response['count'] > page_size:
-            data += ("Found %d roles matching your search. Showing first %s.\n" % (response['count'], page_size))
+            data += ("\nFound %d roles matching your search. Showing first %s.\n" % (response['count'], page_size))
         else:
-            data += ("Found %d roles matching your search:\n" % response['count'])
+            data += ("\nFound %d roles matching your search:\n" % response['count'])
 
         max_len = []
         for role in response['results']:
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: