Fix Contrail 4.0 xenial interface name

Change-Id: Ib8b1e211253145260dfe7676c1f044a942789269
diff --git a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
index 2a1b67d..f83d14b 100644
--- a/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
+++ b/classes/cluster/os_ha_contrail_40/opencontrail/control.yml
@@ -16,7 +16,7 @@
 - cluster.os_ha_contrail_40
 parameters:
   _param:
-    keepalived_vip_interface: eth1
+    keepalived_vip_interface: ${_param:opencontrail_control_interface_name}
     cluster_vip_address: ${_param:opencontrail_control_address}
     cluster_local_address: ${_param:single_address}
     cluster_node01_hostname: ntw01
@@ -27,7 +27,6 @@
     cluster_node03_address: ${_param:opencontrail_control_node03_address}
     opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
     opencontrail_router01_address: 172.16.10.131
-    opencontrail_control_interface_name: eth1
   linux:
     network:
       interface:
diff --git a/classes/cluster/os_ha_contrail_40/opencontrail/init.yml b/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
index 7e1e78c..b36a3f0 100644
--- a/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
+++ b/classes/cluster/os_ha_contrail_40/opencontrail/init.yml
@@ -12,6 +12,7 @@
     opencontrail_control_node01_address: 172.16.10.111
     opencontrail_control_node02_address: 172.16.10.112
     opencontrail_control_node03_address: 172.16.10.113
+    opencontrail_control_interface_name: eth1
   linux:
     network:
       host: