From ff862ba44586454539307ffc85cb9c9e63eea43d Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 23 Mar 2014 08:59:36 -0700 Subject: [PATCH] Use virtualenv_version fact to unconfuse puppet We now have a facter entry for virtualenv version which seems to be pretty accurate. Use it so that we can stop trying to reinstall virtualenv all the time. Change-Id: I793637b15c8704ada40397e77da30e30f22647e6 --- modules/openstack_project/manifests/base.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp index 9185eccf0b..108e62d0ef 100644 --- a/modules/openstack_project/manifests/base.pp +++ b/modules/openstack_project/manifests/base.pp @@ -44,8 +44,15 @@ class openstack_project::base( } include pip + $desired_virtualenv = '1.10.1' + + if (( versioncmp($::virtualenv_version, $desired_virtualenv) < 0 )) { + $virtualenv_ensure = $desired_virtualenv + } else { + $virtualenv_ensure = present + } package { 'virtualenv': - ensure => '1.10.1', + ensure => $virtualenv_ensure, provider => pip, require => Class['pip'], }