Merge "Revert "[rocky] Define keystone domain for heat stack""