From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 31 Jul 2017 15:26:19 +0000 (+0000)
Subject: Merge "Prevent haproxy to run iptables during docker-puppet configuration"
X-Git-Tag: opnfv-6.0.0~90
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=48ead62f6fcb1b833c044f099644cb32a06c3206;p=apex-puppet-tripleo.git

Merge "Prevent haproxy to run iptables during docker-puppet configuration"
---

48ead62f6fcb1b833c044f099644cb32a06c3206