Merge "jenkins job networking odl v2"

diff --cc jjb/integration/integration-templates.yaml
index 10a7e6d02cc79dd13a9dbb51e8ac2ea2f3e8e072,a516a988107e8c7178b2335f469ff0d110e840bb..c48a183770805b50b75116eef693c44b9f6d1dd4
--- 1/jjb/integration/integration-templates.yaml
--- 2/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@@ -1003,12 -795,16 +1003,16 @@@
              description: 'Openstack version to use with devstack'
          - string:
              name: ODL_ML2_DRIVER_REPO
 -            default: 'https://github.com/openstack/networking-odl'
 +            default: '{odl-ml2-driver-repo}'
              description: 'URL to fetch networking-odl driver'
          - string:
-             name: ODL_ML2_VERSION
-             default: '{odl-ml2-version}'
+             name: ODL_ML2_BRANCH
+             default: '{odl-ml2-branch}'
              description: 'Version of networking-odl to checkout from the repo'
+         - string:
+             name: ODL_ML2_DRIVER_VERSION
+             default: '{odl-ml2-driver-version}'
+             description: 'Mode of networking-odl (v1 or v2)'
          - string:
              name: ODL_ENABLE_L3_FWD
              default: '{odl-enable-l3}'
@@@ -1117,12 -913,16 +1121,16 @@@
              description: 'Openstack version to use with devstack'
          - string:
              name: ODL_ML2_DRIVER_REPO
 -            default: 'https://github.com/openstack/networking-odl'
 +            default: '{odl-ml2-driver-repo}'
              description: 'URL to fetch networking-odl driver'
          - string:
-             name: ODL_ML2_VERSION
-             default: '{odl-ml2-version}'
+             name: ODL_ML2_BRANCH
+             default: '{odl-ml2-branch}'
              description: 'Version of networking-odl to checkout from the repo'
+         - string:
+             name: ODL_ML2_DRIVER_VERSION
+             default: '{odl-ml2-driver-version}'
+             description: 'Mode of networking-odl (v1 or v2)'
          - string:
              name: ODL_ENABLE_L3_FWD
              default: '{odl-enable-l3}'