Following puppet layout more

Also add keylimpi as a node