From 153aeae4f0b1f235780d1a0d091c5fb9243d6e18 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 22 Nov 2017 13:43:03 -0500 Subject: [PATCH] Revert "Revert "Remove zuul-env from DIB images"" We've updated the fetch-zuul-cloner role to properly create the virtualenv and pyyaml dependency now. This reverts commit 132cdf30d5cab56d3b948b4c77022b47c2e7e50e. Change-Id: I3fee0144eef4adeeb2b1f905c1f58c5bb4a6e554 Depends-On: I3e55a3a1582aa7dea21c7de67260c2c906c2192b Signed-off-by: Paul Belanger --- .../nodepool-base/install.d/89-install-zuul | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100755 nodepool/elements/nodepool-base/install.d/89-install-zuul diff --git a/nodepool/elements/nodepool-base/install.d/89-install-zuul b/nodepool/elements/nodepool-base/install.d/89-install-zuul deleted file mode 100755 index ac78adbd5d..0000000000 --- a/nodepool/elements/nodepool-base/install.d/89-install-zuul +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Copyright (C) 2015 OpenStack Foundation -# Copyright 2017 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# - -if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then - set -x -fi -set -eu -set -o pipefail - -virtualenv /usr/zuul-env -/usr/zuul-env/bin/pip install git+https://git.openstack.org/openstack-infra/zuul.git