Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
657495d1
Commit
657495d1
authored
Jul 10, 2015
by
Carlos E. Garcia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor spelling changes
parent
7c73e9c1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
contrib/inventory/ec2.ini
+1
-1
contrib/inventory/ec2.py
+2
-2
docsite/rst/guide_gce.rst
+1
-1
examples/ansible.cfg
+2
-2
lib/ansible/constants.py
+1
-1
No files found.
contrib/inventory/ec2.ini
View file @
657495d1
...
...
@@ -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
# the boto instance variables hold precedence in the event of a collision.
# WARNING: - instances that are in the private vpc, _without_ public ip address
# will not be listed in the inventory until
l You set:
# will not be listed in the inventory until
You set:
# vpc_destination_variable = 'private_ip_address'
vpc_destination_variable
=
ip_address
...
...
contrib/inventory/ec2.py
View file @
657495d1
...
...
@@ -795,7 +795,7 @@ class Ec2Inventory(object):
# Inventory: Group by security group
if
self
.
group_by_security_group
and
not
is_redis
:
# Check for the exist
a
nce of the 'SecurityGroups' key and also if
# Check for the exist
e
nce of the 'SecurityGroups' key and also if
# this key has some value. When the cluster is not placed in a SG
# the query can return None here and cause an error.
if
'SecurityGroups'
in
cluster
and
cluster
[
'SecurityGroups'
]
is
not
None
:
...
...
@@ -887,7 +887,7 @@ class Ec2Inventory(object):
# Inventory: Group by security group
if
self
.
group_by_security_group
:
# Check for the exist
a
nce of the 'SecurityGroups' key and also if
# Check for the exist
e
nce of the 'SecurityGroups' key and also if
# this key has some value. When the cluster is not placed in a SG
# the query can return None here and cause an error.
if
'SecurityGroups'
in
cluster
and
cluster
[
'SecurityGroups'
]
is
not
None
:
...
...
docsite/rst/guide_gce.rst
View file @
657495d1
...
...
@@ -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_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 ad
d
ress 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.
...
...
examples/ansible.cfg
View file @
657495d1
...
...
@@ -87,7 +87,7 @@ timeout = 10
# templates indicates to users editing templates files will be replaced.
# 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}
# This short version is better used in temp
al
tes as it won't flag the file as changed every run.
# This short version is better used in temp
la
tes as it won't flag the file as changed every run.
ansible_managed = Ansible managed: {file} on {host}
# by default, ansible-playbook will display "Skipping [host]" if it determines a task
...
...
@@ -236,5 +236,5 @@ accelerate_daemon_timeout = 30
[selinux]
# file systems that require special treatment when dealing with security context
# the default behaviour that copies the existing context or uses the user default
# needs to be changed to use the file system depend
a
nt context.
# needs to be changed to use the file system depend
e
nt context.
#special_context_filesystems=nfs,vboxsf,fuse,ramfs
lib/ansible/constants.py
View file @
657495d1
...
...
@@ -109,7 +109,7 @@ YAML_FILENAME_EXTENSIONS = [ "", ".yml", ".yaml", ".json" ]
# sections in config file
DEFAULTS
=
'defaults'
# generaly configurable things
# general
l
y configurable things
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_MODULE_PATH
=
get_config
(
p
,
DEFAULTS
,
'library'
,
'ANSIBLE_LIBRARY'
,
None
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment