Fix model for kubernetes with contrail deployment

Replace interface to vhost0
Uncomment edge router
Add vsrx IP

Change-Id: I2b14a420bab8ad2374891be22f8d7643becb19c0
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index 05068fb..188c379 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -7,7 +7,7 @@
 - cluster.virtual-mcp11-k8s-contrail.kubernetes.compute
 parameters:
   _param:
-    keepalived_vip_interface: ens4
+    keepalived_vip_interface: vhost0
     keepalived_vip_virtual_router_id: 60
     kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
     kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 5657ac9..0fdeb1d 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -5,7 +5,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.trusty
-#- system.opencontrail.client.resource.edge_router
+- system.opencontrail.client.resource.edge_router
 - system.rabbitmq.server.cluster
 - system.opencontrail.control.cluster
 - system.opencontrail.client.cluster
@@ -28,8 +28,8 @@
     cluster_node03_address: ${_param:opencontrail_control_node03_address}
     rabbitmq_secret_key: password
     rabbitmq_admin_password: password
-    # opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
-    # opencontrail_router01_address: 172.16.10.131
+    opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
+    opencontrail_router01_address: 172.16.10.131
   linux:
     network:
       interface: