Merge "Added netvirt-vpnservice-3node-openstack-integration"

diff --combined jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
index f60426cea7b49b8c170ee13ade787132d3d06308,2b95b75add1b37a41c48a93ce7c28007ab3fdf50..f4a4d8d76b1790c876d2fd4ef4cbd9440df640d8
--- 1/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
--- 2/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml
@@@ -27,7 -27,7 +27,7 @@@
  
      openstack-vms: 4
  
 -    install-features: 'odl-ovsdb-openstack'
 +    install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
  
      schedule: 'H H * * *'
  
@@@ -35,6 -35,8 +35,8 @@@
  
      enable-haproxy: 'yes'
  
+     public-bridge: 'br-ex'
+ 
      enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest'
  
      disable-openstack-services: 'swift,cinder,n-net,q-vpn,n-cpu'