This reverts commit 4dafe7e254.
Commit has been reverted after conversation between Gage Hugo and Karl
Kloppenborg.
It has been decided to add this back in as it breaks ceilometer support
Karl Kloppenborg has offered to incubate the helm chart.
Change-Id: Ife6a47c7ed43075912a836b3b9c2e87fc2d13055