Per discussion on the call today, I think we're ok with leaving this here for now and doing some refactoring after we migrate to puppet-coi.  I'll take this for a test run once the accompanying upstream stuff (https://review.openstack.org/#/c/36222/2) goes in.