openstack/openstack-ansible
Code Issues Proposed changes

Merge "Resolves lookup plugin name duplication issue"

Browse Source
This commit is contained in:
Jenkins 2015-04-17 21:56:02 +00:00 committed by Gerrit Code Review
commit b20d9a52ab
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/plugins/lookups/py_pkgs.py
View File

@ -134,7 +134,7 @@ class DependencyFileProcessor(object):
if git_item.split('_')[0] == 'git': if git_item.split('_')[0] == 'git':
var_name = 'git' var_name = 'git'
else: else:
var_name = git_item.split('_')[0] var_name = git_item.split('_git_repo')[0]
git_data['repo'] = loaded_yaml.get(git_item) git_data['repo'] = loaded_yaml.get(git_item)
git_data['branch'] = loaded_yaml.get( git_data['branch'] = loaded_yaml.get(
@ -164,7 +164,6 @@ class DependencyFileProcessor(object):
"""Process files. """Process files.
:type ext: ``tuple`` :type ext: ``tuple``
:type lower_priority: ``bol``
""" """
file_names = self._filter_files( file_names = self._filter_files(
file_names=self.file_names, file_names=self.file_names,
@ -185,6 +184,7 @@ class DependencyFileProcessor(object):
if [i for i in BUILT_IN_PIP_PACKAGE_VARS if i in key]: if [i for i in BUILT_IN_PIP_PACKAGE_VARS if i in key]:
self.pip['py_package'].extend(values) self.pip['py_package'].extend(values)
def _abs_path(path): def _abs_path(path):
return os.path.abspath( return os.path.abspath(
os.path.expanduser( os.path.expanduser(
@ -192,6 +192,7 @@ def _abs_path(path):
) )
) )
class LookupModule(object): class LookupModule(object):
def __init__(self, basedir=None, **kwargs): def __init__(self, basedir=None, **kwargs):