make new site.pp parsing/catalog generation pass

add cinder module, comment out todo