Remove 99-install-zuul from nodepool-base element
This seems to have been here since the beginning of time (with time being the project-config split). However, since then, Openstack_project::Slave_common as acquired the ability to install this same environment (I290a695c697fb456bee6f8212ba50b6c1b4533fc). The difference was that this file installed zuul from git, while puppet was installing from pip. However, that changed in If07b31f3a735cf7bcf6bfb8591ed37577f5ae201 and puppet is now installing zuul from git. Thus since this now duplicates what's happening in puppet, I do not believe want or need this. This element is now breaking the Fedora 24 build when it tries to overwrite the existing virtualenv already created by puppet. python::virtualenv creates the virtualenv with a "-p python" argument, while the second call doesn't, which creates issues with the symlink layout (see [1] for details). [1] https://github.com/pypa/virtualenv/issues/976 Change-Id: I7963630c699eaa4984adc6a155bea8f74280cd80
This commit is contained in:
parent
73512d8a39
commit
236821a4fd
@ -1,28 +0,0 @@
|
||||
#!/bin/bash
|
||||
# Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# Install Zuul into a virtualenv
|
||||
# This is in /usr instead of /usr/local due to this bug on precise:
|
||||
# https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/839588
|
||||
|
||||
# dib-lint: disable=setu setpipefail
|
||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
||||
set -x
|
||||
fi
|
||||
set -e
|
||||
|
||||
git clone /opt/git/openstack-infra/zuul /tmp/zuul
|
||||
sudo virtualenv /usr/zuul-env
|
||||
sudo -H /usr/zuul-env/bin/pip install /tmp/zuul
|
||||
sudo rm -fr /tmp/zuul
|
Loading…
Reference in New Issue
Block a user