Updated code to reflect server name for both openstack and ec2 when --ch...

Please review.