Change the port to get compatibility with Oxygen

The jetty.xml file in Oxygen has only one configured port and it is
8181. Nitrogen's jetty had two: 8181 and 8080. We were changing 8080,
however as that port does not exist in Oxygen' jetty.xml, ODL fails.

Change-Id: Icd0396f31749e78f85298beb5706fbe1975d99d5
Signed-off-by: Manuel Buil <mbuil@suse.com>

diff --git a/tasks/configure_nb_rest_port.yml b/tasks/configure_nb_rest_port.yml
index d2756ea9963e5242fa8e1ca19547edfa02f9fd91..892774b2474802d9ca7fda0c7f07c11120ab11af 100644 (file)
--- a/tasks/configure_nb_rest_port.yml
+++ b/tasks/configure_nb_rest_port.yml
@@ -1,7 +1,7 @@
 - name: Configure ODL NB REST port
   lineinfile:
     dest: /opt/opendaylight/etc/jetty.xml
-    regexp: name="jetty.port" default="8080"
+    regexp: name="jetty.port" default="8181"
     line: '                    <Property name="jetty.port" default="{{ nb_rest_port }}" />'
     owner: odl
     group: odl

diff --git a/vars/main.yml b/vars/main.yml
index 9202936618e89534fb4cb2907eddb82432019263..addd49f59634f3c342d35421477d9ede05366c14 100755 (executable)
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -46,7 +46,7 @@ cluster_features:
 
 # Specifies the port for the ODL northbound REST interface to listen on.
 # This was added because OpenStack's Swift project uses a conflicting port.
-nb_rest_port: 8080
+nb_rest_port: 8181
 
 # Specifies the port for the ODL clustering which is being used by Akka
 # remoting for east-west communication.