summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@gazlene.net>2018-07-09 18:27:51 +0200
committerColleen Murphy <colleen@gazlene.net>2018-07-09 18:27:51 +0200
commit3b44d63528d0b6a2fd1ac4fde7bfba2ad67d9185 (patch)
tree51e46696d7384df445052c9580104d5618f9af18
parentbb2f9fc027bfc5ae09aa861b005c707e6681e960 (diff)
Don't install python-yaml package
PyYAML is already a dependency of subunit2sql, so the distro package doesn't need to be installed explicitly. If it is installed by the distro, then on a system with pip 10 the subunit2sql installation will fail. Change-Id: Ie7be5cf01fcf9a630c7bf282549a862515c159d9
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 01 Aug 2018 23:10:36 +0000 Reviewed-on: https://review.openstack.org/581111 Project: openstack-infra/puppet-subunit2sql Branch: refs/heads/master
-rw-r--r--manifests/init.pp7
1 files changed, 0 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e05426e..785288f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -85,12 +85,6 @@ class subunit2sql (
85 } 85 }
86 } 86 }
87 87
88 if ! defined(Package['python-yaml']) {
89 package { 'python-yaml':
90 ensure => present,
91 }
92 }
93
94 if ! defined(Package['gear']) { 88 if ! defined(Package['gear']) {
95 package { 'gear': 89 package { 'gear':
96 ensure => latest, 90 ensure => latest,
@@ -116,7 +110,6 @@ class subunit2sql (
116 require => [ 110 require => [
117 Package['python-daemon'], 111 Package['python-daemon'],
118 Package['python-zmq'], 112 Package['python-zmq'],
119 Package['python-yaml'],
120 Package['gear'], 113 Package['gear'],
121 Exec['install-subunit2sql-safely'], 114 Exec['install-subunit2sql-safely'],
122 Package['python-subunit'], 115 Package['python-subunit'],