INTPAK-164 Disable MD-SAL based trust store

OFP has no support for MD-SAL based trust store. We were trying to
enable it in HA, however it does not work and lacks support. For now we
need to stick with the file based trust store.

Change-Id: I25fd24a71fa2f61b0c54f9601953219749918188
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/CHANGELOG b/CHANGELOG
index 8688de688b6ca0a1c368750f3f415766868bda72..c792b10f91d39844338c45b0162691bc10e6c27b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -70,3 +70,5 @@
 - Configure Java Options via karaf instead of Systemd
 2018-04-24 Release 8.1.1
 - Fix Java Options to also include ODL/Karaf default options
+2018-04-25 Release 8.1.2
+- Disable MD-SAL Trust Store

diff --git a/metadata.json b/metadata.json
index c4ead6c9734438c1b23ef0abefb3d381469ea7c3..60ef6729a2a874806946447d07d8b470b7c6cbfc 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "opendaylight-opendaylight",
-    "version": "8.1.1",
+    "version": "8.1.2",
     "author": "Daniel Farrell",
     "summary": "Puppet module that installs and configures the OpenDaylight SDN controller",
     "license": "BSD-2-Clause",

diff --git a/templates/aaa-cert-config.xml.erb b/templates/aaa-cert-config.xml.erb
index d6faa891630cba1c4747f64ea977d07de08c6b65..c2509bb8eb3fb4a01d450231e64d1cc0490f70dc 100644 (file)
--- a/templates/aaa-cert-config.xml.erb
+++ b/templates/aaa-cert-config.xml.erb
@@ -1,6 +1,6 @@
 <aaa-cert-service-config xmlns="urn:opendaylight:yang:aaa:cert">
   <use-config>true</use-config>
-  <use-mdsal><%= scope.lookupvar('opendaylight::enable_ha') %></use-mdsal>
+  <use-mdsal>false</use-mdsal>
   <bundle-name>opendaylight</bundle-name>
   <ctlKeystore>
     <name>ctl.jks</name>