diff --git a/puppet/all-nodes-config.j2.yaml b/puppet/all-nodes-config.j2.yaml
index 6cfaf2d43a..957cdd4742 100644
--- a/puppet/all-nodes-config.j2.yaml
+++ b/puppet/all-nodes-config.j2.yaml
@@ -176,6 +176,8 @@ resources:
                   get_param: [NetVipMap, {get_param: [ServiceNetMap, keystone_public_api_network]}]
                 public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
                 controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
+                # the internal_api_virtual_ip is needed for contrail only
+                internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
                 network_virtual_ips:
 {%- for network in networks if network.vip|default(false) %}
 # External virtual ip is currently being handled separately as public_virtual_ip.
@@ -185,10 +187,6 @@ resources:
                     ip_address: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]}
                     index: {{loop.index}}
 {%- endif %}
-{%- if network.name == 'InternalApi' %}
-                # the internal_api_virtual_ip is needed for contrail only
-                internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
-{%- endif %}
 {%- endfor %}
                 redis_vip: {get_param: RedisVirtualIP}
 {%- for network in networks if network.name == 'StorageNFS' %}