Partial revert of a64f86e3a0
matching puppet-openstack-integration workaround
https://review.openstack.org/420167
Related-bug: 1656276
Change-Id: Iffc70e22a762f58c3f946e27cd0064f3e33b892d
Partial revert of a64f86e3a0
matching puppet-openstack-integration workaround
https://review.openstack.org/420167
Related-bug: 1656276
Change-Id: Iffc70e22a762f58c3f946e27cd0064f3e33b892d