x/packstack
Code Issues Proposed changes

prevent packstack from aborting of o-p-m package has no deps

Browse Source 
If the openstack-puppet-modules has no dependencies (other than those
explicitly filtered out), packstack will abort with an error.  This
patch allows the deployment to continue even if the egrep filter returns
an error.

Change-Id: I5642717d2dc093a18e6d1b0dc7f6f782426db843
Closes-bug: #1332705
This commit is contained in:
Lars Kellogg-Stedman
2014-06-20 16:55:57 -04:00
parent 8e27961f05
commit f00ac8cab8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packstack/plugins/puppet_950.py
View File

@@ -135,7 +135,10 @@ def install_deps(config, messages):
local = utils.ScriptRunner()
local.append('rpm -q --requires %s | egrep -v "^(rpmlib|\/|perl)"'
% modules_pkg)
rc, modules_deps = local.execute()
# This can fail if there are no dependencies other than those
# filtered out by the egrep expression.
rc, modules_deps = local.execute(can_fail=False)
# Modules package might not be installed if we are running from source.
# In this case we assume user knows what (s)he's doing and we don't