Install ODL from latest Beryllium SR repo

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

diff --git a/CHANGELOG b/CHANGELOG
index 0ef4e8bd1129cd2531050dd5f83e24a34c8391c2..2605557c2af7c0ded82806c5072132147150b2f9 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,3 +34,5 @@
 - Minor bump due to Puppetforge issue
 2016-06-02 Release 3.7.0
 - Add param to configure ODL RPM repo
+2016-08-08 Release 3.7.1
+- Install ODL RPM from latest Beryllium SR repo

diff --git a/README.markdown b/README.markdown
index 825814b4931f16d16603f11d67b53a660ca160b9..0a5b8fa19ded8456ec266a962eef5dcddac40874 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -37,8 +37,9 @@ All OpenDaylight configuration should be handled through the ODL Puppet
 module's [params](#parameters). If you need a new knob, [please raise an
 Issue][8].
 
-Both supported [install methods](#install-method) default to the latest
-OpenDaylight release, which is currently [Beryllium][18].
+The master branch installs OpenDaylight from the latest testing RPM repository
+by default. There are stable/<release> branches that install OpenDaylight
+releases and service releases, like Beryllium or Beryllium SR3.
 
 ## Setup
 
@@ -166,7 +167,7 @@ class { 'opendaylight':
 The naming convention follows the naming convention of the CentOS Community
 Build System, which is where upstream ODL hosts its RPMs. The
 `opendaylight-40-release` example above would install OpenDaylight Beryllium
-4.0.0 from the [nfv7-opendaylight-40-release][19] repo. Repo names ending in
+4.0.0 from the [nfv7-opendaylight-40-release][18] repo. Repo names ending in
 `-release` will always contain well-tested, officially released versions of
 OpenDaylight. Repos ending in `-testing` contain frequent, but unstable and
 unofficial, releases. The ODL version given in repo names shows which major
@@ -176,7 +177,7 @@ will provide the latest release with major version 4 (which could include
 Service Releases, like SR2 4.2).
 
 For a full list of OpenDaylight releases and their CBS repos, see the
-[OpenDaylight Deployment wiki][20].
+[OpenDaylight Deployment wiki][19].
 
 This is only read when `install_method` is `rpm`.
 
@@ -446,6 +447,5 @@ See our [git commit history][17] for contributor information.
 [15]: https://github.com/dfarrell07/puppet-opendaylight/blob/master/CHANGELOG
 [16]: https://github.com/dfarrell07/puppet-opendaylight/releases
 [17]: https://github.com/dfarrell07/puppet-opendaylight/commits/master
-[18]: http://cbs.centos.org/repos/nfv7-opendaylight-42-release/x86_64/os/Packages/
-[19]: http://cbs.centos.org/repos/nfv7-opendaylight-40-release/x86_64/os/Packages/ OpenDaylight Beryllium CentOS CBS repo
-[20]: https://wiki.opendaylight.org/view/Deployment#RPM OpenDaylight RPMs and their repos
+[18]: http://cbs.centos.org/repos/nfv7-opendaylight-40-release/x86_64/os/Packages/ OpenDaylight Beryllium CentOS CBS repo
+[19]: https://wiki.opendaylight.org/view/Deployment#RPM OpenDaylight RPMs and their repos

diff --git a/manifests/params.pp b/manifests/params.pp
index e43b25fc17dd919e25404c8e8cf53af9be7c9c8b..ec09f628a63ad8bbc8f8319b7c5ebf6bb8760049 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,8 +13,8 @@ class opendaylight::params {
   $odl_rest_port = '8080'
   $odl_bind_ip = '0.0.0.0'
   $install_method = 'rpm'
-  $rpm_repo = 'opendaylight-42-release'
-  $tarball_url = 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz'
+  $rpm_repo = 'opendaylight-4-release'
+  $tarball_url = ''
   $unitfile_url = 'https://github.com/dfarrell07/opendaylight-systemd/archive/master/opendaylight-unitfile.tar.gz'
   $odl_rest_port = '8080'
   $enable_l3 = 'no'

diff --git a/metadata.json b/metadata.json
index a79f80c2b6985e84a51c7ab5e7f720facd9ba9b6..160926b3a344954b42508071ff5ca203047256ef 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "dfarrell07-opendaylight",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "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 b80c1013b320befbea7d6f96b90d8ad0cffae268..db7a904c5647a65f4a222c76f7685fd0338d0c7c 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -231,10 +231,10 @@ def tarball_install_tests(options = {})
   # Extract params
   # NB: These default values should be the same as ones in opendaylight::params
   # TODO: Remove this possible source of bugs^^
-  tarball_url = options.fetch(:tarball_url, 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz')
+  tarball_url = options.fetch(:tarball_url, '')
   unitfile_url = options.fetch(:unitfile_url, 'https://github.com/dfarrell07/opendaylight-systemd/archive/master/opendaylight-unitfile.tar.gz')
   osfamily = options.fetch(:osfamily, 'RedHat')
-  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-42-release')
+  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-4-release')
 
   # Confirm presence of tarball-related resources
   it { should contain_archive('opendaylight') }
@@ -362,7 +362,7 @@ end
 
 def rpm_install_tests(options = {})
   # Extract params
-  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-42-release')
+  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-4-release')
 
   # Default to CentOS 7 Yum repo URL
 
@@ -396,7 +396,7 @@ end
 def unsupported_os_tests(options = {})
   # Extract params
   expected_msg = options.fetch(:expected_msg)
-  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-42-release')
+  rpm_repo = options.fetch(:rpm_repo, 'opendaylight-4-release')
 
   # Confirm that classes fail on unsupported OSs
   it { expect { should contain_class('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }