role class for diamond, move generic into init

- add role class 

- move the contents of "generic" partly into the role
  class (variables) and partly into the init.pp

Change-Id: I518225d8913c8f10354a487a05be9c1e76dfb595