Merge pull request #14044 from skorochkin/devel

Adding support for scm-based role source urls (ansible-galaxy)
This commit is contained in:
Brian Coca
2016-01-26 10:41:05 -05:00
3 changed files with 17 additions and 4 deletions

View File

@@ -385,7 +385,8 @@ class GalaxyCLI(CLI):
# roles were specified directly, so we'll just go out grab them
# (and their dependencies, unless the user doesn't want us to).
for rname in self.args:
roles_left.append(GalaxyRole(self.galaxy, rname.strip()))
role = RoleRequirement.role_yaml_parse(rname.strip())
roles_left.append(GalaxyRole(self.galaxy, **role))
for role in roles_left:
display.vvv('Installing role %s ' % role.name)
@@ -681,4 +682,3 @@ class GalaxyCLI(CLI):
display.display(resp['status'])
return True