Pin setuptools<45.0.0 for setupOpenstackVirtualenv
* Unhardcode python version for setupOpenstackVirtualenv
Change-Id: I45c56c8d6dec98ee24e600d595c33a5e1a2641e6
Related-Prod: PRODX-2254
diff --git a/src/com/mirantis/mk/Openstack.groovy b/src/com/mirantis/mk/Openstack.groovy
index b11f628..277d839 100644
--- a/src/com/mirantis/mk/Openstack.groovy
+++ b/src/com/mirantis/mk/Openstack.groovy
@@ -22,9 +22,9 @@
* @param version Version of the OpenStack clients
*/
-def setupOpenstackVirtualenv(path, version = 'latest') {
- def python = new com.mirantis.mk.Python()
- python.setupDocutilsVirtualenv(path)
+def setupOpenstackVirtualenv(path, version = 'latest', python="python2") {
+ def pythonLib = new com.mirantis.mk.Python()
+ pythonLib.setupDocutilsVirtualenv(path)
def openstack_kilo_packages = [
//XXX: hack to fix https://bugs.launchpad.net/ubuntu/+source/python-pip/+bug/1635463
@@ -68,7 +68,7 @@
} else {
requirements = openstack_latest_packages
}
- python.setupVirtualenv(path, 'python2', requirements, null, true)
+ pythonLib.setupVirtualenv(path, python, requirements, null, true)
}
/**