INTPAK-134 Updates Jetty configuration

Jetty configuration has been changed to only include 1 connector by
default (previously 2).  The configuration has been changed to operate
on that single connector, as well as update TLS ports configuration to
use the http-default group (now applied to the connector instead of
http-legacy).

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

diff --git a/CHANGELOG b/CHANGELOG
index 9fbf541b1411aae1419e15e305a22fc077e74f82..1bdc1f496a58666afaee8d1ee9c0fcb3f6230d3e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -58,3 +58,5 @@
 - Add param to log karaf logs to either file or console
 2017-01-04 Release 6.3.1
 - Bump default package for Debian from Carbon to Nitrogen
+2017-01-30 Release 6.3.2
+- Update Jetty configuration

diff --git a/manifests/config.pp b/manifests/config.pp
index 7ffcbc2b48f75bf54ecd50a0a0e29f9f1bc26b79..8c8709bfcae2225de99516ac7cd9d82a9f7331b6 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -57,14 +57,14 @@ class opendaylight::config {
       incl    => '/opt/opendaylight/etc/jetty.xml',
       context => '/files/opt/opendaylight/etc/jetty.xml/Configure',
       lens    => 'Xml.lns',
-      changes => ["rm Call[2]/Arg/New/Set[#attribute[name='port']]"]
+      changes => ["rm Call[1]/Arg/New/Set[#attribute[name='port']]"]
     }
 
     augeas {'ODL SSL REST Port':
       incl    => '/opt/opendaylight/etc/jetty.xml',
       context => '/files/opt/opendaylight/etc/jetty.xml/Configure',
       lens    => 'Xml.lns',
-      changes => ["set New[2]/Set[#attribute[name='securePort']]/Property/#attribute/default ${opendaylight::odl_rest_port}"]
+      changes => ["set New[1]/Set[#attribute[name='securePort']]/Property/#attribute/default ${opendaylight::odl_rest_port}"]
     }
 
     file_line { 'set pax TLS port':
@@ -132,7 +132,7 @@ class opendaylight::config {
       context => '/files/opt/opendaylight/etc/jetty.xml/Configure',
       lens    => 'Xml.lns',
       changes => [
-        "set Call[2]/Arg/New/Set[#attribute[name='port']]/Property/#attribute/default
+        "set Call[1]/Arg/New/Set[#attribute[name='port']]/Property/#attribute/default
           ${opendaylight::odl_rest_port}"]
     }
   }
@@ -161,8 +161,8 @@ class opendaylight::config {
       context => '/files/opt/opendaylight/etc/jetty.xml/Configure',
       lens    => 'Xml.lns',
       changes => [
-        "set Call[1]/Arg/New/Set[#attribute[name='host']]/Property/#attribute/default ${opendaylight::odl_bind_ip}",
-        "set Call[2]/Arg/New/Set[#attribute[name='host']]/Property/#attribute/default ${opendaylight::odl_bind_ip}"]
+        "set Call[1]/Arg/New/Set[#attribute[name='host']]/Property/#attribute/default ${opendaylight::odl_bind_ip}"
+      ]
     }
 
     file_line { 'set pax bind IP':

diff --git a/metadata.json b/metadata.json
index 273c14c233ec5afb297245aa74dea599411bb969..3ed2e7be4783a82a76cdc983ff73ea0514c6b57e 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
     "name": "opendaylight-opendaylight",
-    "version": "6.3.1",
+    "version": "6.3.2",
     "author": "Daniel Farrell",
     "summary": "Puppet module that installs and configures the OpenDaylight SDN controller",
     "license": "BSD-2-Clause",