[CORD-1650]
Finish changeover to new network configuration variables

Change-Id: I9d96c49e908245d009976ae101ca4b704e8dbab8
diff --git a/roles/compute-node-config/defaults/main.yml b/roles/compute-node-config/defaults/main.yml
index fcef5a4..31579a5 100644
--- a/roles/compute-node-config/defaults/main.yml
+++ b/roles/compute-node-config/defaults/main.yml
@@ -31,19 +31,15 @@
 # VTN adds it to `br-int`, when provided as the `dataPlaneIntf`
 # default values:
 #  - `fabric` is default when using MaaS
-#  - `vethfabric1` is default for OpenCloud (setup with interface-config role)
+#  - `fabricbond` is default for all other configs (created with interface-config role)
 
-vtn_integration_bridge_interface: fabric
+vtn_integration_bridge_interface: fabricbond
 
 computenode_fabric_interfaces:
   - "{{ vtn_integration_bridge_interface }}"
   - br-int
 
 # used in openstack-compute-vtn.yaml.j2, referencing network in management-net.yaml.j2
-# default values:
-#  - 'veth3' default with MaaS
-#  - 'vethmgmt1' with OpenCloud
-
 use_vtn_net_management_host: False
-vtn_net_management_host_interface: veth3
+vtn_net_management_host_interface: vethmgmt1