Fix bug 1366045 - CONTRAIL_INTERNAL_VIP variable is used to decide contrail HA setup, so do not set None as the CONTRAIL_INTERNAL_VIP and EXTERNAL_VIP in non HA setup.
Fix bug 1365682 - setting report_interval to 5 and removing sql_connection from compute nodes nova.confi if openstack and compute node are different."
Change-Id: I78fa61d9860adb9db2354e751c6cf3c6e9827754