nfv labs fixes

Change-Id: I8a677cfde623d0da405d0e34ee4356390b7512ff
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
index 7b96ef7..6bfbcc3 100644
--- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml
@@ -2,8 +2,9 @@
 - system.linux.system.lowmem
 - system.linux.system.repo.cassandra
 - system.linux.system.repo.mcp.contrail
-#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mos10
+- system.linux.system.repo.ubuntu
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.trusty
 - system.opencontrail.client.resource.edge_router
@@ -29,6 +30,7 @@
     opencontrail_router01_hostname: vsrx01.${_param:cluster_domain}
     opencontrail_router01_address: 172.16.10.131
     openstack_version: mitaka
+    linux_system_codename: trusty
   linux:
     network:
       interface: