Add KeyName when keypair is set
DRY up config dependent logic