Merge "Merge pre|post puppet resources into pre|post config."
authorJenkins <jenkins@review.openstack.org>
Mon, 24 Apr 2017 18:42:00 +0000 (18:42 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 24 Apr 2017 18:42:00 +0000 (18:42 +0000)

Trivial merge