diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index f5cf29c7a3..99b8f39ae6 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -810,7 +810,6 @@ vmware_vcenter_insecure: "True" ###################### # OpenDaylight ###################### -opendaylight_release: "0.6.2-Carbon" opendaylight_mechanism_driver: "opendaylight_v2" opendaylight_l3_service_plugin: "odl-router_v2" opendaylight_acl_impl: "learn" diff --git a/ansible/roles/opendaylight/templates/org.apache.karaf.features.cfg.j2 b/ansible/roles/opendaylight/templates/org.apache.karaf.features.cfg.j2 index ba2dfcd513..18da64d881 100644 --- a/ansible/roles/opendaylight/templates/org.apache.karaf.features.cfg.j2 +++ b/ansible/roles/opendaylight/templates/org.apache.karaf.features.cfg.j2 @@ -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 }} diff --git a/doc/source/reference/networking-guide.rst b/doc/source/reference/networking-guide.rst index 131e923eca..8c722b2c04 100644 --- a/doc/source/reference/networking-guide.rst +++ b/doc/source/reference/networking-guide.rst @@ -142,7 +142,6 @@ OpenDaylight ``globals.yml`` configurable options with their defaults include: .. code-block:: yaml - opendaylight_release: "0.6.1-Carbon" opendaylight_mechanism_driver: "opendaylight_v2" opendaylight_l3_service_plugin: "odl-router_v2" opendaylight_acl_impl: "learn" @@ -537,4 +536,3 @@ Verify VF devices were created and the instance starts successfully as in the Neutron SRIOV case. For more information see `OpenStack PCI passthrough documentation `_. - diff --git a/releasenotes/notes/opendaylight_release-removal-5077cd473bee6dbd.yaml b/releasenotes/notes/opendaylight_release-removal-5077cd473bee6dbd.yaml new file mode 100644 index 0000000000..81ab1c83ab --- /dev/null +++ b/releasenotes/notes/opendaylight_release-removal-5077cd473bee6dbd.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + ``opendaylight_release`` variable is removed, version is discovered automatically + while booting features.