Code Review / apex.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 5c41b84) | patch
Fixes incompatible python-docker package 93/65593/2
authorTim Rozet <trozet@redhat.com>
Wed, 5 Dec 2018 15:54:38 +0000 (10:54 -0500)
committerTim Rozet <trozet@redhat.com>
Wed, 5 Dec 2018 18:56:52 +0000 (13:56 -0500)
commitea88285a511f7aa13cff3d491e143d17188b700f
treebf2ba5cd96db6490b7eaa0eccddd786e537a7921tree | snapshot
parent5c41b8486a46e3c86a573b7130792624b3f5ed26commit | 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>
apex/builders/undercloud_builder.py diff | blob | history
build/nics-template.yaml.jinja2 diff | blob | history