From ccdc0c73814bf82ad94b287e6b6e1a500d2c4cc9 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 17 Jul 2014 05:42:32 +0200 Subject: [PATCH] Revert "Revert "Update desired virtualenv version everywhere"" Add upgrading of setuptools to prepare-node.sh. We want this to happen everywhere, and quite honestly I'm not sure I fully trust trying to get puppet to do it. This reverts commit 3bc3a11244f4a4e28a4c97feec4987940d0f34cc. Change-Id: Idf09be0e1e086e20f9e71ceb26602fea1fc62173 --- install_puppet.sh | 1 + modules/openstack_project/manifests/base.pp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/install_puppet.sh b/install_puppet.sh index f43063a12e..95476b924d 100755 --- a/install_puppet.sh +++ b/install_puppet.sh @@ -173,6 +173,7 @@ function setup_pip { fi python get-pip.py + pip install -U setuptools } # diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp index 8da14c7b44..e61d40d9a5 100644 --- a/modules/openstack_project/manifests/base.pp +++ b/modules/openstack_project/manifests/base.pp @@ -47,7 +47,7 @@ class openstack_project::base( } include pip - $desired_virtualenv = '1.10.1' + $desired_virtualenv = '1.11.4' if (( versioncmp($::virtualenv_version, $desired_virtualenv) < 0 )) { $virtualenv_ensure = $desired_virtualenv