cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed documentation typos and bits that needed clarification. Fixed missing spaces in VALID_ACTIONS.

Browse source
This commit is contained in:
chouseknecht 2015-12-10 10:57:48 -05:00 committed by James Cammarata
parent ba16f2ae95
commit abec9331d8
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
docs/man/man1/ansible-galaxy.1.asciidoc.in
View file

@ -147,8 +147,9 @@ configured in your *ansible.cfg* file (/etc/ansible/roles if not configured)
SEARCH
------
The *search* sub-command returns a filtered list of roles found at
galaxy.ansible.com.
The *search* sub-command returns a filtered list of roles found on the remote
server.
USAGE
~~~~~
@ -170,7 +171,7 @@ Provide a comma separated list of Platforms on which to filter.
Specify the username of a Galaxy contributor on which to filter.
*-c*, *--ingore-certs*::
*-c*, *--ignore-certs*::
Ignore TLS certificate errors.
@ -199,7 +200,7 @@ OPTIONS
The path to the directory containing your roles. The default is the *roles_path*
configured in your *ansible.cfg* file (/etc/ansible/roles if not configured)
*-c*, *--ingore-certs*::
*-c*, *--ignore-certs*::
Ignore TLS certificate errors.
@ -213,7 +214,7 @@ LOGIN
The *login* sub-command is used to authenticate with galaxy.ansible.com.
Authentication is required to use the import, delete and setup commands.
It will authenticate the user,retrieve a token from Galaxy, and store it
It will authenticate the user, retrieve a token from Galaxy, and store it
in the user's home directory.
USAGE
@ -236,7 +237,7 @@ click on Personal Access Token to create a token.
OPTIONS
~~~~~~~
*-c*, *--ingore-certs*::
*-c*, *--ignore-certs*::
Ignore TLS certificate errors.
@ -262,7 +263,7 @@ $ ansible-galaxy import [options] github_user github_repo
OPTIONS
~~~~~~~
*-c*, *--ingore-certs*::
*-c*, *--ignore-certs*::
Ignore TLS certificate errors.
@ -291,7 +292,7 @@ $ ansible-galaxy delete [options] github_user github_repo
OPTIONS
~~~~~~~
*-c*, *--ingore-certs*::
*-c*, *--ignore-certs*::
Ignore TLS certificate errors.
@ -323,7 +324,7 @@ $ ansible-galaxy setup [options] source github_user github_repo secret
OPTIONS
~~~~~~~
*-c*, *--ingore-certs*::
*-c*, *--ignore-certs*::
Ignore TLS certificate errors.

4
docsite/rst/galaxy.rst
View file

@ -364,8 +364,8 @@ When you create your .travis.yml file add the following to cause Travis to notif
section of your ansible.cfg file.
List Travis Integrtions
=======================
List Travis Integrations
========================
Use the --list option to display your Travis integrations:

4
docsite/rst/intro_configuration.rst
View file

@ -906,10 +906,10 @@ The following options can be set in the [galaxy] section of ansible.cfg:
server
======
Override the default Galaxy server value of https://galaxy.ansible.com.
Override the default Galaxy server value of https://galaxy.ansible.com. Useful if you have a hosted version of the Galaxy web app or want to point to the testing site https://galaxy-qa.ansible.com. It does not work against private, hosted repos, which Galaxy can use for fetching and installing roles.
ignore_certs
============
If set to *yes*, ansible-galaxy will not validate TLS certificates. Handy for testing against a server with a self-signed certificate
.
.

2
lib/ansible/cli/galaxy.py
View file

@ -49,7 +49,7 @@ except ImportError:
class GalaxyCLI(CLI):
SKIP_INFO_KEYS = ("name", "description", "readme_html", "related", "summary_fields", "average_aw_composite", "average_aw_score", "url" )
VALID_ACTIONS = ("delete","import","info","init","install","list","login","remove","search","setup")
VALID_ACTIONS = ("delete", "import", "info", "init", "install", "list", "login", "remove", "search", "setup")
def __init__(self, args):
self.api = None