From 280896759a8978900f6b7d95dad9aff92548f146 Mon Sep 17 00:00:00 2001 From: Peter Stachowski Date: Wed, 14 Dec 2016 20:27:44 +0000 Subject: [PATCH] Pip install as 10- incompatible with 05-heat-cfntools Tripleo-image-elements have an install.d file '05-heat-cfntools' that runs the following command: virtualenv --setuptools $VENV With the recent change to diskimage-builder (moving the install of pip and virtualenv to the 10- range) virtualenv is no longer available for this elementr; as a side-effect, the trove kick-start command is now broken and gate jobs are failing. The solutions is to move the (now) 10-install-pip to 04-install-pip. This should still alleviate the race condition that https://review.openstack.org/#/c/408277/ attempted to fix, as all *-package-installs files are 00-, 01- or 02-. Change-Id: Ia4e01f00c4c5e9a2087df1e2a91d9154480a0422 Closes-Bug: #1650008 --- elements/pip-and-virtualenv/README.rst | 3 +++ .../{10-install-pip => 04-install-pip} | 0 2 files changed, 3 insertions(+) rename elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/{10-install-pip => 04-install-pip} (100%) diff --git a/elements/pip-and-virtualenv/README.rst b/elements/pip-and-virtualenv/README.rst index 5516ed0d..db8f4acb 100644 --- a/elements/pip-and-virtualenv/README.rst +++ b/elements/pip-and-virtualenv/README.rst @@ -10,3 +10,6 @@ from get-pip.py and pip (respectively). To install pip and virtualenv from package: export DIB_INSTALLTYPE_pip_and_virtualenv=package + +Any element that uses these commands must be designated as +05-* or higher to ensure that they are first installed. diff --git a/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/10-install-pip b/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip similarity index 100% rename from elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/10-install-pip rename to elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip