summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-21 22:49:11 +0000
committerGerrit Code Review <review@openstack.org>2018-11-21 22:49:11 +0000
commitd7ff514c0c4b7f74a4cb866aac643b32270897c0 (patch)
tree66ac1e524ccdd59c8171e98ed73c408517e062df
parentdcecea024c393aacdd76855453cd19db33a56823 (diff)
parent8360c894dbaccb4bffd082a3f9acc3bba5ee732f (diff)
Merge "Fix subunit2sql install guard for idempotency"HEADmaster
-rw-r--r--manifests/init.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 8bc2042..31cdd05 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -50,7 +50,7 @@ class subunit2sql (
50 # deps we've preinstalled from system packages because they lack wheels on 50 # deps we've preinstalled from system packages because they lack wheels on
51 # PyPI and must be otherwise rebuilt from sdist instead (specifically 51 # PyPI and must be otherwise rebuilt from sdist instead (specifically
52 # netifaces). 52 # netifaces).
53 onlyif => '/bin/bash -c "test \\"$(pip list --format columns | sed -ne \'s/^subunit2sql\s\+\(.*\)$/\1/p\')\\" != \\"$(pip search \'subunit2sql$\' | sed -ne \'s/^subunit2sql (\(.*\)).*$/\1/p\')\\""', 53 onlyif => '/bin/bash -c "test \\"$(pip list --format columns | sed -ne \'s/^subunit2sql\s\+\([[:digit:].]*\)\s*$/\1/p\')\\" != \\"$(pip search \'subunit2sql$\' | sed -ne \'s/^subunit2sql (\(.*\)).*$/\1/p\')\\""',
54 require => [ 54 require => [
55 Class['pip'], 55 Class['pip'],
56 Package['python-mysqldb'], 56 Package['python-mysqldb'],