From 6e17f942b59c35e65d883e4f1dabb5da7ec3e1aa Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Thu, 31 May 2018 12:57:15 +0200
Subject: [PATCH] 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
---
 ansible/group_vars/all.yml                                  | 1 -
 .../opendaylight/templates/org.apache.karaf.features.cfg.j2 | 6 +++++-
 doc/source/reference/networking-guide.rst                   | 2 --
 .../opendaylight_release-removal-5077cd473bee6dbd.yaml      | 5 +++++
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/opendaylight_release-removal-5077cd473bee6dbd.yaml

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 <https://docs.openstack.org/nova/pike/admin/pci-passthrough.html>`_.
-
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.