Merge "Add NetIpMap to hieradata for *ExtraConfig overrides" into stable/pike
authorZuul <zuul@review.openstack.org>
Fri, 3 Nov 2017 03:09:30 +0000 (03:09 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 3 Nov 2017 03:09:30 +0000 (03:09 +0000)

Trivial merge