Fix some variables
Merge branch 'srf-master' of https://github.com/mmz-srf/puppet-module-cloudstack into srf-master