Michael DeHaan
d87830e1cc
Merge branch 'galaxy_github_archive' of git://github.com/willthames/ansible into devel
...
Conflicts:
lib/ansible/utils/__init__.py
2014-08-22 13:58:50 -04:00
James Cammarata
311ec543af
If not specified, do not modify subnet/route_tables for ec2 VPCs
...
Also fixes a bug whereby any changes to the route_tables were not
properly reflected by setting changed=True.
Fixes #8666
2014-08-22 11:03:41 -05:00
James Cammarata
32a5c2bf48
Merge pull request #8721 from sergevanginderachter/syntax_check_avoid_blank_output
...
Avoid multiple blank lines with --syntax-check
2014-08-22 10:46:45 -05:00
James Cammarata
2e6f9804a5
Merge pull request #8716 from pborreli/typos
...
Fixed typos
2014-08-22 10:33:25 -05:00
James Cammarata
ae4af85eb7
Merge pull request #8715 from retr0h/bug/galaxy-syntax-error
...
Corrected a simple syntax error in galaxy
2014-08-22 10:31:28 -05:00
James Cammarata
d01188033f
Checking for localized versions of the su password prompt
...
Fixes #8681
2014-08-22 09:59:40 -05:00
Michael DeHaan
0286c31e85
Assume master branch for downloads if not specified.
2014-08-22 10:01:13 -04:00
Michael DeHaan
0cd40fc372
Remove debug
2014-08-22 09:58:27 -04:00
Michael DeHaan
d66bb47db7
Fixing a typo, still some more work to do on CLI.
2014-08-22 09:57:10 -04:00
Serge van Ginderachter
ad3d3c7379
Avoid multiple blank lines with --syntax-check
...
Only print a blank line between plays when also doing --list-hosts and/or
--list-tasks, otherwise this output just a long list of blank lines, one for
each play.
2014-08-22 15:32:08 +02:00
Pascal Borreli
fe40a7d88a
Fixed typos
2014-08-22 11:39:38 +01:00
John Dewey
39eb11a598
Corrected a simple syntax error in galaxy
2014-08-21 22:01:04 -07:00
Will Thames
850963790d
Allow roles to be installed from archives on github
...
Ensure that the automated scm determination for github.com
repos still copes with .tar.gz archive files.
Handling .zip archives is left as an exercise for the interested reader
2014-08-22 10:06:21 +10:00
Michael DeHaan
8e0af04c3b
Add TOC to galaxy docs.
2014-08-21 18:53:36 -04:00
Michael DeHaan
399fe32287
Clarify examples further.
2014-08-21 18:48:02 -04:00
Michael DeHaan
caf4e44be7
Replace examples for requirements file.
2014-08-21 18:26:40 -04:00
Michael DeHaan
2e95e21cad
Remove some debug in ansible-galaxy upgrades, one of which raises errors down some code paths.
2014-08-21 18:24:40 -04:00
Michael DeHaan
56ce56fdbe
Fix docs typo.
2014-08-21 17:22:39 -04:00
Michael DeHaan
90f09a5e56
update changelog
2014-08-21 17:17:35 -04: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