FIX: resource MUST be cleanupped before using
fix placement of nova options
Merge pull request #343 from xenolog/q_fix_ha_PR1

FIX: resource MUST be cleanupped before using