Merge pull request #116 from Mirantis/fix_ceilometer_add_aodh

fix ceilometer, add aodh to nginx