openstack/ansible-config_template
Code Issues Proposed changes

Forward port missing patches

Browse Source 
The change forward ports the changes in master that didn't
make it into the plugins repo prior to its creation.

Change-Id: If303a4cd6fab9129b54879df9aed3fc8e88295ed
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-01-27 10:04:47 -06:00
parent 2c9c5f005b
commit ecc3607337
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lookups/py_pkgs.py
View File

@ -362,7 +362,7 @@ class DependencyFileProcessor(object):
if 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.
:type loaded_yaml: ``dict``
@ -392,6 +392,13 @@ class DependencyFileProcessor(object):
)
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
git_data['branch'] = loaded_yaml.get(branch_var)
self._check_defaults(git_data, name, 'branch')
@ -449,14 +456,11 @@ class DependencyFileProcessor(object):
role_name = _role_name.split(os.sep)[0]
for key, values in loaded_config.items():
# This conditional is set to ensure we're not processes git
# repos from the defaults file which may conflict with what is
# being set in the repo_packages files.
if '/defaults/main' not in file_name:
if key.endswith('git_repo'):
self._process_git(
loaded_yaml=loaded_config,
git_item=key
git_item=key,
yaml_file_name=file_name
)
if [i for i in BUILT_IN_PIP_PACKAGE_VARS if i in key]: