Update ODL to Beryllium official release

Uses the 40-release repo to pin to ODL Be official, vs 4-testing, which
will always serve the latest Be build.

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

diff --git a/CHANGELOG b/CHANGELOG
index b38fd89b61241ebfb5973b76f8b12fe56fa73035..6244a0063bcd667024711b6b2608cb13c826ac28 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,3 +16,5 @@
 - Update ODL to Beryllium ERP RC3
 2016-02-16 Release 3.2.8
 - Update ODL to Beryllium ERP RC3.1
+2016-02-16 Release 3.2.9
+- Update ODL to Beryllium

diff --git a/README.markdown b/README.markdown
index 423f687c9d84dc0c2fb754b518337dc74c1a89a2..c2151429b2e1dfdc08575d7ed45d219a7e4fe93e 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -36,7 +36,7 @@ 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
-stable OpenDaylight release, which is currently [a Beryllium ERP][18].
+OpenDaylight release, which is currently [Beryllium][18].
 
 ## Setup
 
@@ -364,4 +364,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-4-testing/x86_64/os/Packages/
+[18]: http://cbs.centos.org/repos/nfv7-opendaylight-40-release/x86_64/os/Packages/

diff --git a/manifests/install.pp b/manifests/install.pp
index cebb4a52dcdc45fe36b9d4056c906b682f68540d..b9d60da39eb0af4ff2a7d2a53ebbbc325b52f90e 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-4-testing/$basearch/os/',
-      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/',
+      'CentOS' => 'http://cbs.centos.org/repos/nfv7-opendaylight-40-release/$basearch/os/',
+      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-40-release/$basearch/os/',
     }
 
     # Add OpenDaylight's Yum repository
-    yumrepo { 'opendaylight-4-testing':
+    yumrepo { 'opendaylight-40-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-4-testing'],
+      require => Yumrepo['opendaylight-40-release'],
     }
   }
   elsif $opendaylight::install_method == 'tarball' {

diff --git a/manifests/params.pp b/manifests/params.pp
index 3f705c8d8a3091b4e4a98de19f15ea673932f1c8..17aaea2bab3a9ebeee821a85db244a63986e01be 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -12,7 +12,7 @@ class opendaylight::params {
   $extra_features = []
   $odl_rest_port = '8080'
   $install_method = 'rpm'
-  $tarball_url = 'https://nexus.opendaylight.org/content/repositories/autorelease-1079/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.tar.gz'
+  $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'
   $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 aafed9242326d3bbf9bed4500ff35e70e970af97..f30944fc91adeb01de07fa2cde27eba5949cf92d 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "dfarrell07-opendaylight",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "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 9f928bcd6938fe034b4af47ccd2b82ccd3ead4c9..56c6589f0250e8f99d00b71956ea1171a23fdb29 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/autorelease-1079/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/groups/public/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.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-4-testing') }
+  it { should_not contain_yumrepo('opendaylight-40-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-4-testing/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-40-release/$basearch/os/'
   when 'Fedora'
-    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-40-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-4-testing') }
+  it { should contain_yumrepo('opendaylight-40-release') }
   it { should contain_package('opendaylight') }
 
   # Confirm relationships between RPM-related resources
-  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-4-testing]') }
-  it { should contain_yumrepo('opendaylight-4-testing').that_comes_before('Package[opendaylight]') }
+  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-40-release]') }
+  it { should contain_yumrepo('opendaylight-40-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-4-testing').with(
+    should contain_yumrepo('opendaylight-40-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-4-testing') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
+  it { expect { should contain_yumrepo('opendaylight-40-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 54d44b1e25091108669b6daec4fc68f66feba626..56264b67e5d51c63663f6912a32a950d843754a7 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-4-testing') do
+  describe yumrepo('opendaylight-40-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-4-testing') do
+    describe yumrepo('opendaylight-40-release') do
       it { should_not exist }
       it { should_not be_enabled }
     end