Use new default REST port 8181 vs old 8080+8181

ODL Oxygen after the recent odlparent version bump uses port 8181 as the
default REST API port now, vs old 8080 and 8181.

https://git.opendaylight.org/gerrit/#/c/51531/
https://lists.opendaylight.org/pipermail/controller-dev/2016-September/012677.html
https://lists.opendaylight.org/pipermail/release/2017-February/009244.html
https://lists.opendaylight.org/pipermail/integration-dev/2017-February/009062.html
https://lists.opendaylight.org/pipermail/release/2018-January/013542.html

Change-Id: I43c9dc45d08b85154fd90ec2e6c3f3f4d10be2ce
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/CHANGELOG b/CHANGELOG
index 1bdc1f496a58666afaee8d1ee9c0fcb3f6230d3e..32278c860b4a67c21580f321edbbe0afc61a95fd 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -60,3 +60,5 @@
 - Bump default package for Debian from Carbon to Nitrogen
 2017-01-30 Release 6.3.2
 - Update Jetty configuration
+2017-01-31 Release 7.0.0
+- Update default REST API port to 8181

diff --git a/README.markdown b/README.markdown
index 340058c3dd07c496afdd39a1daec9820c8fbfd9b..a3f3541da607e5f6bd781ea7ae63faae311c7041 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -133,7 +133,7 @@ calls, use the `odl_rest_port` param.
 
 ```puppet
 class { 'opendaylight':
-  odl_rest_port => '8080',
+  odl_rest_port => '8181',
 }
 ```
 
@@ -247,7 +247,7 @@ Valid options: A list of Karaf feature names as strings.
 
 Specifies the port for the ODL northbound REST interface to listen on.
 
-Default: `'8080'`
+Default: `'8181'`
 
 Valid options: A valid port number as a string or integer.
 

diff --git a/manifests/params.pp b/manifests/params.pp
index ed00fa3d14cf58ebaee2322e9ddd6cdd183772d3..74d45a60c59481ab12b845216f780010cc380ce7 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -10,7 +10,7 @@ class opendaylight::params {
   # TODO: Remove this possible source of bugs^^
   $default_features = ['standard', 'wrap', 'ssh']
   $extra_features = []
-  $odl_rest_port = '8080'
+  $odl_rest_port = '8181'
   $odl_bind_ip = '0.0.0.0'
   $rpm_repo = 'https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-$basearch-devel'
   $deb_repo = 'ppa:odl-team/nitrogen'

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

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 27b3773d419e15f5bb3c246bdd9ea0b65a1c4633..81f342003eed06adc859c6e4514ceb865efeb284 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -139,7 +139,7 @@ def odl_rest_port_tests(options = {})
   # Extract params
   # NB: This default value should be the same as one in opendaylight::params
   # TODO: Remove this possible source of bugs^^
-  odl_rest_port = options.fetch(:odl_rest_port, 8080)
+  odl_rest_port = options.fetch(:odl_rest_port, 8181)
   odl_bind_ip = options.fetch(:odl_bind_ip, '0.0.0.0')
   # Confirm properties of ODL REST port config file
   # NB: These hashes don't work with Ruby 1.8.7, but we
@@ -458,7 +458,7 @@ def odl_tls_tests(options = {})
   tls_key_file = options.fetch(:tls_key_file, nil)
   tls_cert_file = options.fetch(:tls_cert_file, nil)
   tls_ca_cert_file = options.fetch(:tls_ca_cert_file, nil)
-  odl_rest_port = options.fetch(:odl_rest_port, 8080)
+  odl_rest_port = options.fetch(:odl_rest_port, 8181)
 
   if enable_tls
     if tls_keystore_password.nil?

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index d1e1eee2f55322fedc8c02ec5e55f00eea7062db..70409594a0fd53e249fc4ea45cdcf1f1db1e5081 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -53,7 +53,7 @@ def install_odl(options = {})
   # Extract params if given, defaulting to odl class defaults if not
   extra_features = options.fetch(:extra_features, ['odl-restconf'])
   default_features = options.fetch(:default_features, ['standard', 'wrap', 'ssh'])
-  odl_rest_port = options.fetch(:odl_rest_port, 8080)
+  odl_rest_port = options.fetch(:odl_rest_port, 8181)
   odl_bind_ip = options.fetch(:odl_bind_ip, '0.0.0.0')
   log_levels = options.fetch(:log_levels, {})
   enable_ha = options.fetch(:enable_ha, false)
@@ -260,7 +260,7 @@ def port_config_validations(options = {})
   # NB: This param default should match the one used by the opendaylight
   #   class, which is defined in opendaylight::params
   # TODO: Remove this possible source of bugs^^
-  odl_rest_port = options.fetch(:odl_rest_port, 8080)
+  odl_rest_port = options.fetch(:odl_rest_port, 8181)
 
   describe file('/opt/opendaylight/etc/jetty.xml') do
     it { should be_file }
@@ -392,7 +392,7 @@ def username_password_validations(options = {})
   # TODO: Remove this possible source of bugs^^
   odl_username = options.fetch(:username, 'admin')
   odl_password = options.fetch(:password, 'admin')
-  odl_check_url = 'http://127.0.0.1:8080/restconf'
+  odl_check_url = 'http://127.0.0.1:8181/restconf'
 
   describe file('/opt/opendaylight/data/idmlight.db.mv.db') do
     it { should be_file }
@@ -468,7 +468,7 @@ def tls_validations(options = {})
   #   class, which is defined in opendaylight::params
   # TODO: Remove this possible source of bugs^^
   tls_keystore_password = options.fetch(:tls_keystore_password)
-  odl_rest_port = options.fetch(:odl_rest_port, 8080)
+  odl_rest_port = options.fetch(:odl_rest_port, 8181)
 
   describe file('/opt/opendaylight/etc/org.ops4j.pax.web.cfg') do
     it { should be_file }