Merge "Fix nova-cpu/collectd hieradata" into stable/pike
authorZuul <zuul@review.openstack.org>
Fri, 3 Nov 2017 22:57:04 +0000 (22:57 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 3 Nov 2017 22:57:04 +0000 (22:57 +0000)

Trivial merge