From dc2958f424df86a4a69bec982057d4be2f117e4c Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 9 Apr 2018 14:56:55 +1000 Subject: [PATCH] Don't require virtualenv package Use puppet-python's checks to ensure presence of python packages. This way we don't create conflicting Package['virtualenv'] entries. Change-Id: I3435a2527f4712d068c5a3c43728bed6011e1ebd --- manifests/install.pp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index 1740050..d77b817 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -19,10 +19,10 @@ class askbot::install ( ensure => present, } - if !defined(Package['virtualenv']) { - package { 'virtualenv': - ensure => present, - } + class { '::python': + pip => true, + dev => true, + virtualenv => true, } python::virtualenv { '/usr/askbot-env': @@ -30,7 +30,6 @@ class askbot::install ( owner => 'root', group => 'root', timeout => 0, - require => Package['virtualenv'], } case $db_provider {