Merge "Remove deprecated node_ips hiera keys"
authorJenkins <jenkins@review.openstack.org>
Wed, 17 Aug 2016 15:28:18 +0000 (15:28 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 17 Aug 2016 15:28:18 +0000 (15:28 +0000)

Trivial merge