This commit resolves an error that was introduced in:
* 16508c32eec11a96e011b6eff66081484d65ffdf
It also moves to a mostly autogenerated config file produced
by the Docker Container within the openstack-helm repo.
Additionally it also removes some extranious whitespace
Change-Id: I3b6d153c89783fa5f818df7d416c565a3d682552
9979444a6a