diff options
author | Tim Rozet <trozet@redhat.com> | 2018-12-05 10:54:38 -0500 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2018-12-05 13:56:52 -0500 |
commit | ea88285a511f7aa13cff3d491e143d17188b700f (patch) | |
tree | bf2ba5cd96db6490b7eaa0eccddd786e537a7921 /ci/util.sh | |
parent | 5c41b8486a46e3c86a573b7130792624b3f5ed26 (diff) |
Fixes incompatible python-docker package
When adding upstream packages to undercloud image, there is a conflict
between a new dependency python2-docker and already installed
python-docker. This patch removes the latter before trying to install
upstream packages.
Also, updates nic templates based on:
https://review.openstack.org/#/c/604943/
Change-Id: Ia7db0a3b37652d066bbe80478689f4d1ebaea560
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci/util.sh')
0 files changed, 0 insertions, 0 deletions