openstack:
- mitaka:
openstack-branch: 'stable/mitaka'
- odl-ml2-version: 'stable/mitaka'
+ odl-ml2-branch: 'stable/mitaka'
+ odl-ml2-driver-version: 'v1'
- liberty:
openstack-branch: 'stable/liberty'
- odl-ml2-version: 'stable/liberty'
+ odl-ml2-branch: 'stable/liberty'
+ odl-ml2-driver-version: 'v1'
openstack-vms: 1
tenant-network-type: 'vxlan'
- security-group-mode: 'none'
\ No newline at end of file
+ security-group-mode: 'none'
SERVICE_PASSWORD=admin
ADMIN_PASSWORD=admin
-enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_VERSION}
+enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH}
ODL_PORT=8080
ODL_MODE=externalodl
LIBVIRT_TYPE=qemu
EOF
+if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then
+ echo "ODL_V2DRIVER=True" >> ${local_conf_file_name}
+fi
if [ "${NUM_ODL_SYSTEM}" -gt 1 ]; then
odl_list=${ODL_SYSTEM_1_IP}
Q_L3_ENABLED=True
ODL_L3=${ODL_L3}
PUBLIC_INTERFACE=br100
-[[post-config|\$NEUTRON_CONF]]
-[DEFAULT]
-service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
EOF
fi
SERVICE_PASSWORD=admin
ADMIN_PASSWORD=admin
-enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_VERSION}
+enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH}
ODL_MODE=compute
LIBVIRT_TYPE=qemu
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}'
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}'
openstack:
- mitaka:
openstack-branch: 'stable/mitaka'
- odl-ml2-version: 'stable/mitaka'
+ odl-ml2-branch: 'stable/mitaka'
+ odl-ml2-driver-version: 'v1'
- newton:
openstack-branch: 'stable/newton'
- odl-ml2-version: 'master'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v1'
+ - newton-nodl-v2:
+ openstack-branch: 'stable/newton'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v2'
openstack-vms: 3
openstack:
- mitaka:
openstack-branch: 'stable/mitaka'
- odl-ml2-version: 'stable/mitaka'
+ odl-ml2-branch: 'stable/mitaka'
+ odl-ml2-driver-version: 'v1'
- newton:
openstack-branch: 'stable/newton'
- odl-ml2-version: 'master'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v1'
+ - newton-nodl-v2:
+ openstack-branch: 'stable/newton'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v2'
openstack-vms: 4
openstack:
- mitaka:
openstack-branch: 'stable/mitaka'
- odl-ml2-version: 'stable/mitaka'
+ odl-ml2-branch: 'stable/mitaka'
+ odl-ml2-driver-version: 'v1'
- newton:
openstack-branch: 'stable/newton'
- odl-ml2-version: 'master'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v1'
+ - newton-nodl-v2:
+ openstack-branch: 'stable/newton'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v2'
openstack-vms: 3
openstack:
- mitaka:
openstack-branch: 'stable/mitaka'
- odl-ml2-version: 'stable/mitaka'
+ odl-ml2-branch: 'stable/mitaka'
+ odl-ml2-driver-version: 'v1'
- newton:
openstack-branch: 'stable/newton'
- odl-ml2-version: 'master'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v1'
+ - newton-nodl-v2:
+ openstack-branch: 'stable/newton'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v2'
openstack-vms: 4
openstack:
- mitaka:
openstack-branch: 'stable/mitaka'
- odl-ml2-version: 'stable/mitaka'
+ odl-ml2-branch: 'stable/mitaka'
+ odl-ml2-driver-version: 'v1'
- newton:
openstack-branch: 'stable/newton'
- odl-ml2-version: 'master'
+ odl-ml2-branch: 'master'
+ odl-ml2-driver-version: 'v1'
openstack-vms: 1