ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-04 15:34:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

galaxy fixes

Browse source
This commit is contained in:
Brian Coca 2015-08-27 19:32:14 -04:00
commit 514fa73fcd
5 changed files with 87 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/cli/galaxy.py
View file

@ -38,7 +38,6 @@ from ansible.galaxy.api import GalaxyAPI
from ansible.galaxy.role import GalaxyRole
from ansible.playbook.role.requirement import RoleRequirement
class GalaxyCLI(CLI):
VALID_ACTIONS = ("init", "info", "install", "list", "remove", "search")
@ -360,6 +359,7 @@ class GalaxyCLI(CLI):
if role_file:
self.display.debug('Getting roles from %s' % role_file)
try:
self.display.debug('Processing role file: %s' % role_file)
f = open(role_file, 'r')
if role_file.endswith('.yaml') or role_file.endswith('.yml'):
try:
@ -389,13 +389,14 @@ class GalaxyCLI(CLI):
role = roles_left.pop(0)
role_path = role.path
self.display.debug('Installing role %s' % role_path)
if role_path:
self.options.roles_path = role_path
else:
self.options.roles_path = roles_path
self.display.debug('Installing role %s from %s' % (role.name, self.options.roles_path))
tmp_file = None
installed = False
if role.src and os.path.isfile(role.src):
@ -404,7 +405,7 @@ class GalaxyCLI(CLI):
else:
if role.scm:
# create tar file from scm url
tmp_file = scm_archive_role(role.scm, role.src, role.version, role.name)
tmp_file = GalaxyRole.scm_archive_role(role.scm, role.src, role.version, role.name)
if role.src:
if '://' not in role.src:
role_data = self.api.lookup_role_by_name(role.src)