openstack/ansible-config_template
Code Issues Proposed changes

Merge "Forward port missing patches"

Browse Source
This commit is contained in:
Jenkins 2016-01-30 15:07:03 +00:00 committed by Gerrit Code Review
commit 4d825289b0
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lookups/py_pkgs.py
View File

@ -362,7 +362,7 @@ class DependencyFileProcessor(object):
if check_item: if check_item:
git_data[item] = check_item git_data[item] = check_item
def _process_git(self, loaded_yaml, git_item): def _process_git(self, loaded_yaml, git_item, yaml_file_name):
"""Process git repos. """Process git repos.
:type loaded_yaml: ``dict`` :type loaded_yaml: ``dict``
@ -392,6 +392,13 @@ class DependencyFileProcessor(object):
) )
git_data['egg_name'] = name.replace('-', '_') git_data['egg_name'] = name.replace('-', '_')
# This conditional is set to ensure we're only processing git
# repos from the defaults file when those same repos are not
# being set in the repo_packages files.
if '/defaults/main' in yaml_file_name:
if name in GIT_PACKAGE_DEFAULT_PARTS:
return
# get the repo branch definition # get the repo branch definition
git_data['branch'] = loaded_yaml.get(branch_var) git_data['branch'] = loaded_yaml.get(branch_var)
self._check_defaults(git_data, name, 'branch') self._check_defaults(git_data, name, 'branch')
@ -449,15 +456,12 @@ class DependencyFileProcessor(object):
role_name = _role_name.split(os.sep)[0] role_name = _role_name.split(os.sep)[0]
for key, values in loaded_config.items(): for key, values in loaded_config.items():
# This conditional is set to ensure we're not processes git if key.endswith('git_repo'):
# repos from the defaults file which may conflict with what is self._process_git(
# being set in the repo_packages files. loaded_yaml=loaded_config,
if '/defaults/main' not in file_name: git_item=key,
if key.endswith('git_repo'): yaml_file_name=file_name
self._process_git( )
loaded_yaml=loaded_config,
git_item=key
)
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._py_pkg_extend(values) self._py_pkg_extend(values)