2 files changed, 5 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot b/deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot
index 32caf96d..426a8fd1 100644
--- a/deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot
+++ b/deploy/adapters/ansible/roles/neutron-network/templates/etc/xorp/config.boot
@@ -1,6 +1,6 @@
 interfaces {
     restore-original-config-on-shutdown: false
-    interface {{ hostvars[inventory_hostname][neutron_vxlan_interface|default(internal_interface)]['device'] }} {
+    interface {{ internal_nic }} {
         description: "Internal pNodes interface"
         disable: false
         default-system-config
@@ -10,8 +10,8 @@ interfaces {
 protocols {
     igmp {
         disable: false
-        interface {{ hostvars[inventory_hostname][neutron_vxlan_interface|default(internal_interface)]['device'] }} {
-            vif {{ hostvars[inventory_hostname][neutron_vxlan_interface|default(internal_interface)]['device'] }} {
+        interface {{ internal_nic }} {
+            vif {{ internal_nic }} {
                 disable: false
                 version: 3
             }
diff --git a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini
index 375f46c2..87937cc7 100644
--- a/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini
+++ b/deploy/adapters/ansible/roles/neutron-network/templates/metadata_agent.ini
@@ -3,7 +3,7 @@
 debug = True
 
 # The Neutron user information for accessing the Neutron API.
-auth_url = http://{{ HA_VIP }}:5000/v2.0
+auth_url = http://{{ internal_vip.ip }}:5000/v2.0
 auth_region = regionOne
 # Turn off verification of the certificate for ssl
 # auth_insecure = False
@@ -17,7 +17,7 @@ admin_password = {{ NEUTRON_PASS }}
 # endpoint_type = adminURL
 
 # IP address used by Nova metadata server
-nova_metadata_ip = {{ HA_VIP }}
+nova_metadata_ip = {{ internal_vip.ip }}
 
 # TCP Port used by Nova metadata server
 nova_metadata_port = 8775