While this is on screen, can I recommend against using ipaddress_xxx in global context? It's the only global variable we create that has a different value on every machine, which is going to catch people out.  (I'm not actually a fan of it on general principles, but hiera resolves some of that.)