Adapt puppet-cinder manifests

Change-Id: I23c00d371b2f79b4382b600e32a712be76571563