Merge "correct vpnservice runs provider mappings physnet name"

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
index 49a7f576a9ea26c9a345ebe83db659e8d2bc7f25..f5af75c7727731b48fee4b2ada0d04ba5a95a2c7 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-1node-multi-openstack.yaml
@@ -33,7 +33,7 @@
 
     odl-enable-l3: 'yes'
 
-    public-bridge: 'br-ex'
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
 

diff --git a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
index 0b30c126c72488f49a9b28f10462bca9b6ec5bbe..a2d128c8f30bc01a312bfb2ef80542d796462e03 100644 (file)
--- a/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-vpnservice-csit-3node-multi-openstack.yaml
@@ -35,7 +35,7 @@
 
     enable-haproxy: 'yes'
 
-    public-bridge: 'br-ex'
+    public-bridge: 'public' # PUBLIC_PHYSICAL_NETWORK
 
     enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'