Merge "etcd: Get FQDN from hiera instead of puppet fact"
authorJenkins <jenkins@review.openstack.org>
Sat, 4 Mar 2017 11:32:20 +0000 (11:32 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 4 Mar 2017 11:32:20 +0000 (11:32 +0000)

Trivial merge