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)
commitf2e2ce264bcd3b18d1ebe8961eec882289c77e40
treef429408bcf3106ac1d3f1a472ffbc3d04149829a
parent41e049ae7c55d178459c1394839c6827a654c345
parent7779bc8ad0ab43e2f57225cfded51e7e2ae18004
Merge "Add NetIpMap to hieradata for *ExtraConfig overrides" into stable/pike