Merge "enable driver_type gre and ml2_gre"

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 74035748e3b987b2fe36c984535d98afef4ed0e4..ef92697ecbff63d92955bc83e228d88e77099aa6 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -56,6 +56,7 @@
     enable-openstack-services: ''
     enable-openstack-compute-services: ''
     enable-openstack-network-services: 'neutron,neutron-api,neutron-dhcp,neutron-metadata-agent'
+    enable-gre-type-driver: 'no'
     ipsec-vxlan-tunnels-enabled: 'no'
     lbaas-service-provider: ''
     num-openstack-sites: 1

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index dc09fba4ce0cfcc3cdda2aa2affc967058bb6509..7b7c12360c9e1e15c036ce824d650b6df42a02bb 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -317,7 +317,13 @@ minimize_polling=True
 physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400
 path_mtu = 1458
 EOF
-
+    if [ "${ENABLE_GRE_TYPE_DRIVERS}" == "yes" ]; then
+        cat >> ${local_conf_file_name} << EOF
+type_drivers = local,flat,vlan,gre,vxlan
+[ml2_type_gre]
+tunnel_id_ranges = 1:1000
+EOF
+    fi
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
         cat >> ${local_conf_file_name} << EOF
 

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index c86808f73619f6c90931b1029cbbc9f49ccdd7f6..e68d44d1e325df48d8ecb29b6418f8cd49988be1 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1123,6 +1123,10 @@
           default: '{odl-ml2-port-binding}'
           description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
           network-topology)'
+      - string:
+          name: ENABLE_GRE_TYPE_DRIVERS
+          default: '{enable-gre-type-driver}'
+          description: 'Enable gre tunnel'
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
           default: '{devstack-kubernetes-plugin-repo}'