openstack/ansible-config_template
Code Issues Proposed changes

Fix regression for proprietary packages

Browse Source 
The proprietary packages index should never be present in the package
index. This change makes sure that anything using the proprietary key
is fully ignored.

Closes-Bug: 1622275
Change-Id: I5f084487c1085868eac84bcccadc85c43ec63caa
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-09-14 14:03:16 -05:00 committed by Jesse Pretorius (odyssey4me)
parent 2b2472fe40
commit 7af6721b45
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lookup/py_pkgs.py
View File

@ -600,6 +600,9 @@ class DependencyFileProcessor(object):
:type pip_packages: ``bool``
"""
if [i for i in pkg_constant if i in pkg_var_name]:
if 'proprietary' in pkg_var_name:
return
self._package_build_index(
packages=packages,
role_name=role_name,
@ -614,8 +617,6 @@ class DependencyFileProcessor(object):
return
elif 'optional' in pkg_var_name:
return
elif 'proprietary' in pkg_var_name:
return
else:
self._package_build_index(
packages=packages,