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

Merge pull request #11552 from cgar/spelling

Browse source 
minor spelling changes
This commit is contained in:
Brian Coca 2015-07-10 12:48:48 -04:00
commit 8ef734a18c
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/inventory/ec2.ini
View file

@ -36,7 +36,7 @@ destination_variable = public_dns_name
# be run from within EC2. The key of an EC2 tag may optionally be used; however # be run from within EC2. The key of an EC2 tag may optionally be used; however
# the boto instance variables hold precedence in the event of a collision. # the boto instance variables hold precedence in the event of a collision.
# WARNING: - instances that are in the private vpc, _without_ public ip address # WARNING: - instances that are in the private vpc, _without_ public ip address
# will not be listed in the inventory untill You set: # will not be listed in the inventory until You set:
# vpc_destination_variable = 'private_ip_address' # vpc_destination_variable = 'private_ip_address'
vpc_destination_variable = ip_address vpc_destination_variable = ip_address

4
contrib/inventory/ec2.py
View file

@ -795,7 +795,7 @@ class Ec2Inventory(object):
# Inventory: Group by security group # Inventory: Group by security group
if self.group_by_security_group and not is_redis: if self.group_by_security_group and not is_redis:
# Check for the existance of the 'SecurityGroups' key and also if # Check for the existence of the 'SecurityGroups' key and also if
# this key has some value. When the cluster is not placed in a SG # this key has some value. When the cluster is not placed in a SG
# the query can return None here and cause an error. # the query can return None here and cause an error.
if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None: if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None:
@ -887,7 +887,7 @@ class Ec2Inventory(object):
# Inventory: Group by security group # Inventory: Group by security group
if self.group_by_security_group: if self.group_by_security_group:
# Check for the existance of the 'SecurityGroups' key and also if # Check for the existence of the 'SecurityGroups' key and also if
# this key has some value. When the cluster is not placed in a SG # this key has some value. When the cluster is not placed in a SG
# the query can return None here and cause an error. # the query can return None here and cause an error.
if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None: if 'SecurityGroups' in cluster and cluster['SecurityGroups'] is not None:

2
docsite/rst/guide_gce.rst
View file

@ -79,7 +79,7 @@ Create a file ``secrets.py`` looking like following, and put it in some folder w
GCE_PARAMS = ('i...@project.googleusercontent.com', '/path/to/project.pem') GCE_PARAMS = ('i...@project.googleusercontent.com', '/path/to/project.pem')
GCE_KEYWORD_PARAMS = {'project': 'project_id'} GCE_KEYWORD_PARAMS = {'project': 'project_id'}
Ensure to enter the email adress from the created services account and not the one from your main account. Ensure to enter the email address from the created services account and not the one from your main account.
Now the modules can be used as above, but the account information can be omitted. Now the modules can be used as above, but the account information can be omitted.

4
examples/ansible.cfg
View file

@ -87,7 +87,7 @@ timeout = 10
# templates indicates to users editing templates files will be replaced. # templates indicates to users editing templates files will be replaced.
# replacing {file}, {host} and {uid} and strftime codes with proper values. # replacing {file}, {host} and {uid} and strftime codes with proper values.
#ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host} #ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host}
# This short version is better used in tempaltes as it won't flag the file as changed every run. # This short version is better used in templates as it won't flag the file as changed every run.
ansible_managed = Ansible managed: {file} on {host} ansible_managed = Ansible managed: {file} on {host}
# by default, ansible-playbook will display "Skipping [host]" if it determines a task # by default, ansible-playbook will display "Skipping [host]" if it determines a task
@ -236,5 +236,5 @@ accelerate_daemon_timeout = 30
[selinux] [selinux]
# file systems that require special treatment when dealing with security context # file systems that require special treatment when dealing with security context
# the default behaviour that copies the existing context or uses the user default # the default behaviour that copies the existing context or uses the user default
# needs to be changed to use the file system dependant context. # needs to be changed to use the file system dependent context.
#special_context_filesystems=nfs,vboxsf,fuse,ramfs #special_context_filesystems=nfs,vboxsf,fuse,ramfs

2
lib/ansible/constants.py
View file

@ -109,7 +109,7 @@ YAML_FILENAME_EXTENSIONS = [ "", ".yml", ".yaml", ".json" ]
# sections in config file # sections in config file
DEFAULTS='defaults' DEFAULTS='defaults'
# generaly configurable things # generally configurable things
DEFAULT_DEBUG = get_config(p, DEFAULTS, 'debug', 'ANSIBLE_DEBUG', False, boolean=True) DEFAULT_DEBUG = get_config(p, DEFAULTS, 'debug', 'ANSIBLE_DEBUG', False, boolean=True)
DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', get_config(p, DEFAULTS,'inventory','ANSIBLE_INVENTORY', '/etc/ansible/hosts'))) DEFAULT_HOST_LIST = shell_expand_path(get_config(p, DEFAULTS, 'hostfile', 'ANSIBLE_HOSTS', get_config(p, DEFAULTS,'inventory','ANSIBLE_INVENTORY', '/etc/ansible/hosts')))
DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None) DEFAULT_MODULE_PATH = get_config(p, DEFAULTS, 'library', 'ANSIBLE_LIBRARY', None)