Fix the constant failure of puppet on cacti

First of all, the apache config file goes in a different direcetory.
Secondly, the graph creation is trying to make graphs for disks that
are hardcoded and don't exist for a given host.

Change-Id: Ie277f3959b7a01e71ed437582b0155e5fc5bef02
Merge "Fix the constant failure of puppet on cacti"