Fix ESXiToVRouterIp.map in case when we delete contrail-vmware

- Fix notice in contrail-compute-vmware-pkg.pp
- Fix settings description for internal DVS name

Change-Id: Ie7b081a0d20bfee627a18c7ce58694652f9a1bb5

deployment_scripts/puppet/manifests/contrail-compute-vmware-pkg.pp

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-notice('MODULAR: contrail/contrail-compute-pkg.pp')
+notice('MODULAR: contrail/contrail-compute-vmware-pkg.pp')
 
 include contrail
 class { 'contrail::compute::vmware_pkg': }

deployment_scripts/puppet/modules/contrail/templates/ESXiToVRouterIp.map.erb

@@ -2,6 +2,9 @@
 network_metadata=scope.lookupvar('contrail::network_metadata')
 contrail_esxi_info=scope.lookupvar('contrail::contrail_esxi_info')
 -%>
-<% contrail_esxi_info.each do | host | -%>
-<%= host['host_ip'] %>:<%= scope.function_get_node_private_ip([network_metadata, host['admin_ip']]) %>
-<% end %>
+<%- contrail_esxi_info.each do | host | -%>
+<%- private_ip=scope.function_get_node_private_ip([network_metadata, host['admin_ip']]) -%>
+<%- if private_ip -%>
+<%= host['host_ip'] %>:<%= private_ip %>
+<%- end -%>
+<%- end -%>

environment_config.yaml

@@ -224,7 +224,7 @@ attributes:
         action: "hide"
   dvs_internal:
     value: "Contrail-DVS-Int"
-    label: "Private DVS name"
+    label: "Internal DVS name"
     description: "Name of DVS that need for internal contrail traffic"
     weight: 330
     type: "text"