Update ODL to Beryllium SR1

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

diff --git a/CHANGELOG b/CHANGELOG
index 10ebc6c482d455c19ce8a66fca931fe2fcbcfe76..2ab901361f46f951899e7fe6465a500acce19682 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,8 +18,6 @@
 - Update ODL to Beryllium ERP RC3.1
 2016-02-16 Release 3.2.9
 - Update ODL to Beryllium
-2016-02-16 Release 3.2.9
-- Update ODL to Beryllium
 2016-03-03 Release 3.3.0
 - Add ODL HA config, fix ARP-yes when L3
 2016-03-04 Release 3.3.1
@@ -28,3 +26,5 @@
 - Bugfix in ODL HA jolokia.xml file content
 2016-03-11 Release 3.4.0
 - Add param to config ODL's bind IP addr
+2016-03-23 Release 3.5.0
+- Update ODL to Beryllium SR1

diff --git a/README.markdown b/README.markdown
index 807c2682686772a2a8eaa64da930ef2b672bd340..536550355aa5e6c971b10197be9e434d32e8243f 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -417,4 +417,4 @@ 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-40-release/x86_64/os/Packages/
+[18]: http://cbs.centos.org/repos/nfv7-opendaylight-41-release/x86_64/os/Packages/

diff --git a/manifests/install.pp b/manifests/install.pp
index 9b11e68eb1c47791905bc897b11131c3175f2f3e..c65334d2080f24cfd8b9bdec94504769098945eb 100644 (file)
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -11,12 +11,12 @@ class opendaylight::install {
     # Choose Yum URL based on OS (CentOS vs Fedora)
     # NB: Currently using the CentOS CBS for both Fedora and CentOS
     $base_url = $::operatingsystem ? {
-      'CentOS' => 'http://cbs.centos.org/repos/nfv7-opendaylight-40-release/$basearch/os/',
-      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-40-release/$basearch/os/',
+      'CentOS' => 'http://cbs.centos.org/repos/nfv7-opendaylight-41-release/$basearch/os/',
+      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-41-release/$basearch/os/',
     }
 
     # Add OpenDaylight's Yum repository
-    yumrepo { 'opendaylight-40-release':
+    yumrepo { 'opendaylight-41-release':
       # 'ensure' isn't supported with Puppet <3.5
       # Seems to default to present, but docs don't say
       # https://docs.puppetlabs.com/references/3.4.0/type.html#yumrepo
@@ -33,7 +33,7 @@ class opendaylight::install {
     # Install the OpenDaylight RPM
     package { 'opendaylight':
       ensure  => present,
-      require => Yumrepo['opendaylight-40-release'],
+      require => Yumrepo['opendaylight-41-release'],
     }
     ->
     # Configure the systemd file to force ipv4 binds (instead of ipv6)

diff --git a/manifests/params.pp b/manifests/params.pp
index 865505268a85b8668b16e6f1df17a35670fce46d..3ad731743e17cb89ddf98592b13f9ba120543096 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,7 +13,7 @@ class opendaylight::params {
   $odl_rest_port = '8080'
   $odl_bind_ip = '0.0.0.0'
   $install_method = 'rpm'
-  $tarball_url = 'https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz'
+  $tarball_url = 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz'
   $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 bca5e7c1009d9154c21436b771e28f047ca3007a..84c2f076648418b4c8c3827cefef9cec4445cd8b 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "dfarrell07-opendaylight",
-  "version": "3.4.0",
+  "version": "3.5.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 56c6589f0250e8f99d00b71956ea1171a23fdb29..5e238c37e7b93852750ba7f191536098f4694aa8 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -231,7 +231,7 @@ 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/groups/public/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz')
+  tarball_url = options.fetch(:tarball_url, 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz')
   unitfile_url = options.fetch(:unitfile_url, 'https://github.com/dfarrell07/opendaylight-systemd/archive/master/opendaylight-unitfile.tar.gz')
   osfamily = options.fetch(:osfamily, 'RedHat')
 
@@ -355,7 +355,7 @@ def tarball_install_tests(options = {})
   end
 
   # Verify that there are no unexpected resources from RPM-type installs
-  it { should_not contain_yumrepo('opendaylight-40-release') }
+  it { should_not contain_yumrepo('opendaylight-41-release') }
   it { should_not contain_package('opendaylight') }
 end
 
@@ -366,9 +366,9 @@ def rpm_install_tests(options = {})
   operatingsystem  = options.fetch(:operatingsystem, 'CentOS')
   case operatingsystem
   when 'CentOS'
-    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-40-release/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-41-release/$basearch/os/'
   when 'Fedora'
-    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-40-release/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-41-release/$basearch/os/'
   else
     fail("Unknown operatingsystem: #{operatingsystem}")
   end
@@ -376,18 +376,18 @@ def rpm_install_tests(options = {})
   # Default to CentOS 7 Yum repo URL
 
   # Confirm presence of RPM-related resources
-  it { should contain_yumrepo('opendaylight-40-release') }
+  it { should contain_yumrepo('opendaylight-41-release') }
   it { should contain_package('opendaylight') }
 
   # Confirm relationships between RPM-related resources
-  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-40-release]') }
-  it { should contain_yumrepo('opendaylight-40-release').that_comes_before('Package[opendaylight]') }
+  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-41-release]') }
+  it { should contain_yumrepo('opendaylight-41-release').that_comes_before('Package[opendaylight]') }
 
   # Confirm properties of RPM-related resources
   # NB: These hashes don't work with Ruby 1.8.7, but we
   #   don't support 1.8.7 so that's okay. See issue #36.
   it {
-    should contain_yumrepo('opendaylight-40-release').with(
+    should contain_yumrepo('opendaylight-41-release').with(
       'enabled'     => '1',
       'gpgcheck'    => '0',
       'descr'       => 'CentOS CBS OpenDaylight Berillium testing repository',
@@ -413,7 +413,7 @@ def unsupported_os_tests(options = {})
   it { expect { should contain_class('opendaylight::service') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
 
   # Confirm that other resources fail on unsupported OSs
-  it { expect { should contain_yumrepo('opendaylight-40-release') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
+  it { expect { should contain_yumrepo('opendaylight-41-release') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
   it { expect { should contain_package('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
   it { expect { should contain_service('opendaylight') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
   it { expect { should contain_file('org.apache.karaf.features.cfg') }.to raise_error(Puppet::Error, /#{expected_msg}/) }

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 56264b67e5d51c63663f6912a32a950d843754a7..29be758c056f551a87c23b8f8ed8e23cd6632b96 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -303,7 +303,7 @@ end
 
 # Shared function that handles validations specific to RPM-type installs
 def rpm_validations()
-  describe yumrepo('opendaylight-40-release') do
+  describe yumrepo('opendaylight-41-release') do
     it { should exist }
     it { should be_enabled }
   end
@@ -321,7 +321,7 @@ def tarball_validations()
 
   # Repo checks break (not fail) when yum doesn't make sense (Ubuntu)
   if ['centos-7', 'fedora-22', 'fedora-23-docker'].include? ENV['RS_SET']
-    describe yumrepo('opendaylight-40-release') do
+    describe yumrepo('opendaylight-41-release') do
       it { should_not exist }
       it { should_not be_enabled }
     end