Update to ODL Beryllium SR2 4.2.0

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

diff --git a/CHANGELOG b/CHANGELOG
index 2ab901361f46f951899e7fe6465a500acce19682..cfa15fbe6c4e7ac42b2364ed5dd851cf76dc4221 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,3 +28,7 @@
 - Add param to config ODL's bind IP addr
 2016-03-23 Release 3.5.0
 - Update ODL to Beryllium SR1
+2016-06-01 Release 3.6.0
+- Update ODL to Beryllium SR2
+2016-06-01 Release 3.6.1
+- Minor bump due to Puppetforge issue

diff --git a/README.markdown b/README.markdown
index 536550355aa5e6c971b10197be9e434d32e8243f..d13293adbeee49f05d678e38afca3fc608887291 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-41-release/x86_64/os/Packages/
+[18]: http://cbs.centos.org/repos/nfv7-opendaylight-42-release/x86_64/os/Packages/

diff --git a/manifests/install.pp b/manifests/install.pp
index 67ef1d8479ea5d17c073748e3865db6e8b33f061..41a5d33c2ce4f92b319ce7a9e823c3f63591d3e6 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-41-release/$basearch/os/',
-      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-41-release/$basearch/os/',
+      'CentOS' => 'http://cbs.centos.org/repos/nfv7-opendaylight-42-release/$basearch/os/',
+      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-42-release/$basearch/os/',
     }
 
     # Add OpenDaylight's Yum repository
-    yumrepo { 'opendaylight-41-release':
+    yumrepo { 'opendaylight-42-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-41-release'],
+      require => Yumrepo['opendaylight-42-release'],
     }
     ->
     # Configure the systemd file to force ipv4 binds (instead of ipv6)

diff --git a/manifests/params.pp b/manifests/params.pp
index 3ad731743e17cb89ddf98592b13f9ba120543096..5fa3143603272db4fef58f5eb0fb69598d107599 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/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz'
+  $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'
   $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 84c2f076648418b4c8c3827cefef9cec4445cd8b..236a65ee2094b2cfe4501dd0456de64df5ef1050 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "dfarrell07-opendaylight",
-  "version": "3.5.0",
+  "version": "3.6.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 5e238c37e7b93852750ba7f191536098f4694aa8..a251e12449ebd02a6293b0d1430cb796cf2df136 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/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.1-Beryllium-SR1/distribution-karaf-0.4.1-Beryllium-SR1.tar.gz')
+  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')
   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-41-release') }
+  it { should_not contain_yumrepo('opendaylight-42-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-41-release/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-42-release/$basearch/os/'
   when 'Fedora'
-    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-41-release/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-42-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-41-release') }
+  it { should contain_yumrepo('opendaylight-42-release') }
   it { should contain_package('opendaylight') }
 
   # Confirm relationships between RPM-related resources
-  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-41-release]') }
-  it { should contain_yumrepo('opendaylight-41-release').that_comes_before('Package[opendaylight]') }
+  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-42-release]') }
+  it { should contain_yumrepo('opendaylight-42-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-41-release').with(
+    should contain_yumrepo('opendaylight-42-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-41-release') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
+  it { expect { should contain_yumrepo('opendaylight-42-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 38585034192d066c5ee0de22bb879b89e666b17c..ee6e264a289d1df0ad76c3023ff215c769d6aab3 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -302,7 +302,7 @@ end
 
 # Shared function that handles validations specific to RPM-type installs
 def rpm_validations()
-  describe yumrepo('opendaylight-41-release') do
+  describe yumrepo('opendaylight-42-release') do
     it { should exist }
     it { should be_enabled }
   end
@@ -320,7 +320,7 @@ def tarball_validations()
 
   # Repo checks break (not fail) when yum doesn't make sense (Ubuntu)
   if ['centos-7', 'fedora-22', 'fedora-23', 'fedora-23-docker'].include? ENV['RS_SET']
-    describe yumrepo('opendaylight-41-release') do
+    describe yumrepo('opendaylight-42-release') do
       it { should_not exist }
       it { should_not be_enabled }
     end