Greg Swift
5ecfe884b8
Extend wait_for module to support draining of active tcp connections
2014-08-21 16:15:59 -05:00
James Cammarata
3b19b83806
Add GovCloud region to list of regions for AWS
...
Fixes #8604
2014-08-21 16:12:51 -05:00
Michael DeHaan
bcb44276fe
Assume github.com URLs are git protocol if not specified.
2014-08-21 17:15:23 -04:00
Michael DeHaan
e7c0b95074
Work in progress on bin/ansible-galaxy changes testing.
2014-08-21 17:15:23 -04:00
Michael DeHaan
12ad110205
Add documentation for new ansible-galaxy role options in 1.8. Much rejoicing.
2014-08-21 17:15:23 -04:00
Michael DeHaan
68e21aa4b0
Add comments about what these new functions do.
2014-08-21 17:15:23 -04:00
Will Thames
6e9abefc11
Corrected bug where role_path was wrong for roles in subdirectories
...
Fixed role name for
- { role: 'lives/in/a/subdirectory' }
Should be 'lives/in/a/subdirectory', not just 'subdirectory'
2014-08-21 17:15:23 -04:00
Will Thames
bf9ea81c4b
Make galaxy work when API server not available
...
`ansible-galaxy init --offline ...` can create a role without
talking to the galaxy api server
`ansible-galaxy install ...` only needs to talk to the galaxy api
server for galaxy roles, not tar files or scm archives
Fixed a bug in command line role installation
2014-08-21 17:15:23 -04:00
Will Thames
31540246dd
Handle older git archive commands
...
Older git archive commands create tar archives even with a tar.gz
extension. So change it to always create tar archives and have
the install_role method cope.
Removed ssh roles from the test case as they don't work unless
you can connect to bitbucket via ssh and have your key there.
Corrected a minor typo in error messages
2014-08-21 17:15:23 -04:00
Will Thames
ada9074276
Allow installation of roles from yaml roles file
...
Added docs
Added more tests
Improved how roles are returned from the parsers
2014-08-21 17:15:23 -04:00
Will Thames
46b59b02ed
Friendly Role Names and roles from URLs
...
* Roles can now be given a friendly name as third field in role spec csv
* Roles can be installed from URL (not just from archived SCMs)
* Integration tests to demonstrate this
* Unit tests to ensure that role spec parsing works as expected
2014-08-21 17:15:23 -04:00
Will Thames
4803e923ff
Improved handling of role_version in repo_url_to_role_name
2014-08-21 17:15:23 -04:00
Will Thames
1803976a40
Ensured that role version can be specified in role dependencies
2014-08-21 17:15:23 -04:00
Will Thames
c2fe33f9f4
Tidied up a little, added tests
...
Moved repo_url_to_role_name to common method in ansible.utils
Added unit test for repo_url_to_role_name
Added integration tests for galaxy
2014-08-21 17:15:23 -04:00
Will Thames
b550cb9bc3
Need to take URLs into account when running playbooks too
...
Ensure that if meta/main.yml has dependencies containing URLs
these are correctly resolved at playbook runtime.
Update role_name during run time so that output of e.g. task names
look sensible
2014-08-21 17:15:23 -04:00
Will Thames
bf3066e650
Change to how SCM is determined
...
Change SCM determination from executing git/hg commands to explicit
in URL.
Fix check for already installed dependencies
2014-08-21 17:15:23 -04:00
Will Thames
36177396c4
Allow ansible-galaxy to install roles from URLs
...
ansible-galaxy can now refer to SCM URLs (git and hg at this point)
for role names
Dependencies need to use the full SCM URLs too.
Otherwise all seems to work well
Test rolesfile
```
http://bitbucket.org/willthames/git-ansible-galaxy,v1.1
https://bitbucket.org/willthames/hg-ansible-galaxy
```
(works with ssh too)
2014-08-21 17:15:23 -04:00
James Cammarata
bae73e5793
Merge branch 'alozovskoy-alozovskoy-debug-ascii-patch' into devel
2014-08-21 15:57:43 -05:00
James Cammarata
4fafd3baa8
Add error checking around json.dumps when not forcing ascii mode
2014-08-21 15:52:36 -05:00
James Cammarata
657d562995
Merge branch 'major-relative-path-fix' into devel
2014-08-21 15:39:24 -05:00
James Cammarata
b98348c2c1
Merge branch 'relative-path-fix' of https://github.com/major/ansible into major-relative-path-fix
2014-08-21 15:32:51 -05:00
Major Hayden
c9cdc9d6f9
File module cannot create relative paths
...
When trying to create a directory relative to the current working
directory, a directory is created at the root of the filesystem
instead. This patch ensures that directories specified with relative
paths will be created in the current working directory. Fully
qualified paths aren't affected
Signed-off-by: Major Hayden <major@mhtx.net>
2014-08-21 15:31:06 -05:00
James Cammarata
3edbab3875
Merge branch 'sergevanginderachter-role_path_var' into devel
2014-08-21 14:17:40 -05:00
James Cammarata
ea5db1818d
Merge branch 'role_path_var' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-role_path_var
2014-08-21 14:14:32 -05:00
James Cammarata
100cb760e6
Merge branch 'l1k-devel' into devel
2014-08-21 14:13:04 -05:00
James Cammarata
24c4277479
Remove tabs added from 677de07
2014-08-21 14:07:18 -05:00
James Cammarata
5e240fec71
Merge branch 'devel' of https://github.com/l1k/ansible into l1k-devel
...
Conflicts:
test/integration/roles/test_copy/tasks/main.yml
2014-08-21 13:56:26 -05:00
James Cammarata
f9183fcb01
Merge branch 'sergevanginderachter-issue_8704_stacktrace_varmerge' into devel
2014-08-21 13:44:34 -05:00
James Cammarata
b81e77cfec
Tweak error language in dict validation
2014-08-21 13:24:53 -05:00
Serge van Ginderachter
3a228b9d55
InventoryScript: better syntax checking for json stream
2014-08-21 18:06:07 +02:00
Serge van Ginderachter
b8d057296a
variable merging: detect if both vars are really dicts when combining/merging dicts
2014-08-21 18:06:02 +02:00
Serge van Ginderachter
7051cdeb57
roles: make role_path (path of current role) available as variable to the task
2014-08-21 11:56:27 +02:00
James Cammarata
8a1fbed5d6
Correct variable blending from vars_files with hostvars in them
...
Fixes #8638
2014-08-20 15:49:01 -05:00
James Cammarata
8956c636a5
Remove incorrect use of module.fail_json during import check for s3
...
Fixes #8698
2014-08-20 12:04:46 -05:00
James Cammarata
d63092ea45
Merge pull request #8689 from willthames/ansible-pull-parallel
...
Restrict ansible-pull to only do scm checkout once
2014-08-20 10:41:11 -05:00
James Cammarata
5b4cf916d7
Merge pull request #8686 from psa/asg-properties
...
asg-properties Get all the properties from ASG's
2014-08-20 09:33:56 -05:00
Serge van Ginderachter
a1f09bd89f
Merge variables for hosts instead of updating in get_variables()
2014-08-20 01:54:46 -05:00
James Cammarata
6975e5fd73
Merge branch 'svg_issue_8621_8664' into devel
2014-08-20 00:15:58 -05:00
Will Thames
92f9b74a68
Restrict ansible-pull to only do scm checkout once
...
This addresses a bug in ansible-pull where running ansible-pull
with an existing inventory causes the ansible job that does
the SCM checkout to run twice - once for localhost and once
for the fully qualified hostname.
This can cause a race condition, and usually results in one
of the ansible checkouts failing because one of the scm checkouts
has its references updated underneath it. Although the SCM checkout
actually succeeds, ansible fails with non-zero exit status, and
so ansible-pull does not continue.
Now that localhost is implicit for ansible runs, the ansible
scm checkout can be done using just localhost as a target.
2014-08-20 14:28:53 +10:00
Paul Armstrong
09979ac20d
asg-properties Get all the properties from ASG's
2014-08-19 15:25:47 -07:00
Michael DeHaan
e6be619257
Merge pull request #8678 from 0x44/debconf-vtypes
...
debconf module: add the missing 'error' vtype and reorder vtypes as they...
2014-08-19 17:57:53 -04:00
Michael DeHaan
231fc84cce
Merge pull request #8671 from nathansoz/patch-2
...
$powershellpath is called as ".$powershellpath"
2014-08-19 15:44:52 -04:00
Michael DeHaan
f2adee9fc9
Merge pull request #8665 from cchurch/winrm_timeout
...
WinRM test for long-running command.
2014-08-19 15:43:00 -04:00
James Cammarata
cecfede85f
Merge remote-tracking branch 'svg/issue_8621_8664' into svg_issue_8621_8664
2014-08-19 11:37:59 -05:00
James Cammarata
d4ff0d125a
Make sure password files from lookups are created with restrictive permissions
...
Also adds checks for the lookup integration test for passwords.
Fixes #8652
2014-08-19 11:30:04 -05:00
James Cammarata
3a7aca6066
Fix no_log value for content in common file args settings
...
Also adds a test to ensure the content value is not logged.
Related to #8647
2014-08-19 10:47:18 -05:00
James Cammarata
8a5675ca9f
Fixing no_log for the playbook level use
...
Fixes #8647
2014-08-19 10:35:01 -05:00
Serge van Ginderachter
0ab721d51e
better logic for all-group variables for implicit localhost
2014-08-19 16:41:51 +02:00
Serge van Ginderachter
3c06833302
group_by: make sure new group has bigger priority than all group
2014-08-19 16:34:30 +02:00
Serge van Ginderachter
a2cfe8770b
Inventory: fix logic mistake in loading/retrieving variables for groups
2014-08-19 16:34:26 +02:00