internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow meta/main.yml to include roles through spec file

Browse Source 
ansible-playbook now works when run with a playbook
that includes a role that includes another role
specified using csv format

Updated one of the roles used in the tests to fix
broken tests - `make test_galaxy` now works

Fixes #11486. Also addresses the problem alluded to in #10620.
This commit is contained in:
Will Thames
2015-10-22 13:25:58 +10:00
parent 2b3c5aa41e
commit 002972c6cf
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/galaxy_roles.yml
View File

@@ -3,7 +3,7 @@
name: oracle_java7
- src: git+http://bitbucket.org/willthames/git-ansible-galaxy
version: v1.4
version: v1.6
- src: http://bitbucket.org/willthames/hg-ansible-galaxy
scm: hg

2
test/integration/galaxy_rolesfile
View File

@@ -1,4 +1,4 @@
git+https://bitbucket.org/willthames/git-ansible-galaxy,v1.4
git+https://bitbucket.org/willthames/git-ansible-galaxy,v1.6
hg+https://bitbucket.org/willthames/hg-ansible-galaxy
https://bitbucket.org/willthames/http-ansible-galaxy/get/master.tar.gz,,http-role
git+git@github.com:geerlingguy/ansible-role-php.git