rhel 8 container build failing on cherry pick of 669471

[wes hayutin]

1-31 03:19:11.003577 | primary | + git config --global user.email <email address hidden>
2020-01-31 03:19:11.006977 | primary | + git config --global user.name Zuul
2020-01-31 03:19:11.008848 | primary | + git remote add upstream https://review.opendev.org/openstack/kolla
2020-01-31 03:19:11.011997 | primary | + git ls-remote https://review.opendev.org/openstack/kolla
2020-01-31 03:19:11.012170 | primary | + grep -E 'refs/changes/[[:digit:]]+/669471/'
2020-01-31 03:19:11.012333 | primary | + awk '{print $2}'
2020-01-31 03:19:11.012447 | primary | + sort -t / -k 5 -g -r
2020-01-31 03:19:11.012873 | primary | + head -1
2020-01-31 03:19:11.012892 | primary | + xargs '-I{}' git fetch https://review.opendev.org/openstack/kolla '{}'
2020-01-31 03:19:12.565843 | primary | From https://review.opendev.org/openstack/kolla
2020-01-31 03:19:12.565891 | primary | * branch refs/changes/71/669471/14 -> FETCH_HEAD
2020-01-31 03:19:12.572573 | primary | + git checkout -b rhel8 FETCH_HEAD
2020-01-31 03:19:12.919999 | primary | Switched to a new branch 'rhel8'
2020-01-31 03:19:12.920531 | primary | + git_rebase_branch=master
2020-01-31 03:19:12.920553 | primary | + git pull --rebase upstream master
2020-01-31 03:19:13.336092 | primary | From https://review.opendev.org/openstack/kolla
2020-01-31 03:19:13.336153 | primary | * branch master -> FETCH_HEAD
2020-01-31 03:19:13.336787 | primary | * [new branch] master -> upstream/master
2020-01-31 03:19:13.418278 | primary | First, rewinding head to replay your work on top of it...
2020-01-31 03:19:13.690607 | primary | Applying: DNM: Add dnf modules for rhel8/py3 containers
2020-01-31 03:19:13.713916 | primary | Using index info to reconstruct a base tree...
2020-01-31 03:19:13.713952 | primary | M docker/keystone/keystone-base/Dockerfile.j2
2020-01-31 03:19:13.713960 | primary | M docker/mariadb/Dockerfile.j2
2020-01-31 03:19:13.713966 | primary | M docker/nova/nova-libvirt/Dockerfile.j2
2020-01-31 03:19:13.713972 | primary | Falling back to patching base and 3-way merge...
2020-01-31 03:19:13.713983 | primary | Auto-merging docker/nova/nova-libvirt/Dockerfile.j2
2020-01-31 03:19:13.713990 | primary | Auto-merging docker/mariadb/Dockerfile.j2
2020-01-31 03:19:13.713996 | primary | Auto-merging docker/keystone/keystone-base/Dockerfile.j2
2020-01-31 03:19:13.714001 | primary | CONFLICT (content): Merge conflict in docker/keystone/keystone-base/Dockerfile.j2
2020-01-31 03:19:13.717636 | primary | error: Failed to merge in the changes.
2020-01-31 03:19:13.717667 | primary | Patch failed at 0001 DNM: Add dnf modules for rhel8/py3 containers
2020-01-31 03:19:13.717676 | primary | Use 'git am --show-current-patch' to see the failed patch
2020-01-31 03:19:13.717682 | primary |
2020-01-31 03:19:13.717688 | primary | Resolve all conflicts manually, mark them as resolved with

https://logserver.rdoproject.org/openstack-periodic-master/opendev.org/openstack/tripleo-ci/master/periodic-tripleo-rhel-8-master-containers-build-push/6f6a34d/job-output.txt

[wes hayutin (weshayutin)]

https://review.opendev.org/#/c/671183/ resolved merge conflict