Merge branch 'master' of https://nougat.cablelabs.com/VNE/OPNFV

conf/lab1/deploy/1-controller/deploy-settings.yaml

@@ -2,7 +2,7 @@ global_params:
   ha_enabled: false
 
 deploy_options:
-  sdn_controller: opendaylight
+  sdn_controller: onos
   sdn_l3: true
   tacker: false
   congress: false

conf/lab2a/deploy/deploy-settings.yaml

 global_params:
-  ha_enabled: true
+  ha_enabled: false
 
 deploy_options:
   sdn_controller: opendaylight
+  sdn_l3: false
   tacker: false
   congress: false
+  sfc: false
+  vpn: false