From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 6 Mar 2017 10:32:52 +0000 (+0000)
Subject: Merge "Put docker puppet config in puppet_config dict"
X-Git-Tag: opnfv-6.0.0~964
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=47fcabee464b1e46490087316778b3cff0a55b5b;p=apex-tripleo-heat-templates.git

Merge "Put docker puppet config in puppet_config dict"
---

47fcabee464b1e46490087316778b3cff0a55b5b