Merge "Add Aodh configs for rocky and update kitchen"