Skip to content
Snippets Groups Projects
Commit 6e17f942 authored by Eduardo Gonzalez's avatar Eduardo Gonzalez
Browse files

Improve ODL configuration

Configure automatically ODL version based on the package version
rather than maintain a hardcoded version.

This has caused many issue while package version differs with the variable
set.

Closes-Bug: 1784784
Change-Id: I15da5d2583b5727942d598d183cc481f0e33d0e6
parent cd03876e
No related branches found
No related tags found
No related merge requests found
...@@ -810,7 +810,6 @@ vmware_vcenter_insecure: "True" ...@@ -810,7 +810,6 @@ vmware_vcenter_insecure: "True"
###################### ######################
# OpenDaylight # OpenDaylight
###################### ######################
opendaylight_release: "0.6.2-Carbon"
opendaylight_mechanism_driver: "opendaylight_v2" opendaylight_mechanism_driver: "opendaylight_v2"
opendaylight_l3_service_plugin: "odl-router_v2" opendaylight_l3_service_plugin: "odl-router_v2"
opendaylight_acl_impl: "learn" opendaylight_acl_impl: "learn"
......
...@@ -17,7 +17,11 @@ ...@@ -17,7 +17,11 @@
# #
################################################################################ ################################################################################
featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.8/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.8/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features,mvn:org.apache.karaf.features/spring/3.0.8/xml/features,mvn:org.opendaylight.integration/features-integration-index/{{ opendaylight_release }}/xml/features featuresRepositories = mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features, \
mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features, \
mvn:org.ops4j.pax.web/pax-web-features/3.2.9/xml/features, \
mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features, \
mvn:org.opendaylight.integration/features-integration-index/${project.version}/xml/features
featuresBoot=config,standard,region,package,kar,ssh,management{% if not opendaylight_features == '' %},{% endif %}{{ opendaylight_features }} featuresBoot=config,standard,region,package,kar,ssh,management{% if not opendaylight_features == '' %},{% endif %}{{ opendaylight_features }}
......
...@@ -142,7 +142,6 @@ OpenDaylight ``globals.yml`` configurable options with their defaults include: ...@@ -142,7 +142,6 @@ OpenDaylight ``globals.yml`` configurable options with their defaults include:
.. code-block:: yaml .. code-block:: yaml
opendaylight_release: "0.6.1-Carbon"
opendaylight_mechanism_driver: "opendaylight_v2" opendaylight_mechanism_driver: "opendaylight_v2"
opendaylight_l3_service_plugin: "odl-router_v2" opendaylight_l3_service_plugin: "odl-router_v2"
opendaylight_acl_impl: "learn" opendaylight_acl_impl: "learn"
...@@ -537,4 +536,3 @@ Verify VF devices were created and the instance starts successfully as in ...@@ -537,4 +536,3 @@ Verify VF devices were created and the instance starts successfully as in
the Neutron SRIOV case. the Neutron SRIOV case.
For more information see `OpenStack PCI passthrough documentation <https://docs.openstack.org/nova/pike/admin/pci-passthrough.html>`_. For more information see `OpenStack PCI passthrough documentation <https://docs.openstack.org/nova/pike/admin/pci-passthrough.html>`_.
---
features:
- |
``opendaylight_release`` variable is removed, version is discovered automatically
while booting features.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment