Update ODL to Beryllium ERP 201601200134

Update RPM install repo to Beryllium testing, which currently pulls down
Beryllium Experimental Release Preview 201601200134.

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

diff --git a/README.markdown b/README.markdown
index 327720d35dcd8e123e4763403530fa4afdef5134..f1c73ac9ac8d086de5c68a1173bbf492dfcf5c18 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -34,7 +34,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 [Lithium 3.2.0][18].
+stable OpenDaylight release, which is currently [a Beryllium ERP][18].
 
 ## Setup
 
@@ -267,4 +267,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]: https://www.opendaylight.org/software/downloads/lithium
+[18]: http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/x86_64/os/Packages/

diff --git a/manifests/install.pp b/manifests/install.pp
index 26c199d56077c504676fe8120ee6bb926ca8970f..cebb4a52dcdc45fe36b9d4056c906b682f68540d 100644 (file)
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -11,18 +11,18 @@ 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-3-candidate/$basearch/os/',
-      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/$basearch/os/',
+      'CentOS' => 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/',
+      'Fedora' => 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/',
     }
 
     # Add OpenDaylight's Yum repository
-    yumrepo { 'opendaylight-3-candidate':
+    yumrepo { 'opendaylight-4-testing':
       # '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
       # https://docs.puppetlabs.com/references/3.5.0/type.html#yumrepo
       baseurl  => $base_url,
-      descr    => 'CentOS CBS OpenDaylight Lithium candidate repository',
+      descr    => 'CentOS CBS OpenDaylight Berillium testing repository',
       enabled  => 1,
       # NB: RPM signing is an active TODO, but is not done. We will enable
       #     this gpgcheck once the RPM supports it.
@@ -33,7 +33,7 @@ class opendaylight::install {
     # Install the OpenDaylight RPM
     package { 'opendaylight':
       ensure  => present,
-      require => Yumrepo['opendaylight-3-candidate'],
+      require => Yumrepo['opendaylight-4-testing'],
     }
   }
   elsif $opendaylight::install_method == 'tarball' {

diff --git a/manifests/params.pp b/manifests/params.pp
index 8e85e9fe1bf1286d96d49d56303a1eea4be516f4..daeaf7b6d65ed6bd4a50fbf11c3acddd9a96aa18 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/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz'
+  $tarball_url = 'https://nexus.opendaylight.org/content/repositories/autorelease-1025/org/opendaylight/integration/distribution-karaf/0.4.0-beryllium-daily-v201601200134/distribution-karaf-0.4.0-beryllium-daily-v201601200134.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/spec/spec_helper.rb b/spec/spec_helper.rb
index 5df9a73b4bb1a9a422fd2af1383f2775d76c9c9a..fe53c4c3aec49ed5ea557307eabd02069f78f062 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -131,7 +131,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.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz')
+  tarball_url = options.fetch(:tarball_url, 'https://nexus.opendaylight.org/content/repositories/autorelease-1025/org/opendaylight/integration/distribution-karaf/0.4.0-beryllium-daily-v201601200134/distribution-karaf-0.4.0-beryllium-daily-v201601200134.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')
 
@@ -255,7 +255,7 @@ def tarball_install_tests(options = {})
   end
 
   # Verify that there are no unexpected resources from RPM-type installs
-  it { should_not contain_yumrepo('opendaylight-3-candidate') }
+  it { should_not contain_yumrepo('opendaylight-4-testing') }
   it { should_not contain_package('opendaylight') }
 end
 
@@ -266,9 +266,9 @@ def rpm_install_tests(options = {})
   operatingsystem  = options.fetch(:operatingsystem, 'CentOS')
   case operatingsystem
   when 'CentOS'
-    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/'
   when 'Fedora'
-    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-3-candidate/$basearch/os/'
+    yum_repo = 'http://cbs.centos.org/repos/nfv7-opendaylight-4-testing/$basearch/os/'
   else
     fail("Unknown operatingsystem: #{operatingsystem}")
   end
@@ -276,21 +276,21 @@ def rpm_install_tests(options = {})
   # Default to CentOS 7 Yum repo URL
 
   # Confirm presence of RPM-related resources
-  it { should contain_yumrepo('opendaylight-3-candidate') }
+  it { should contain_yumrepo('opendaylight-4-testing') }
   it { should contain_package('opendaylight') }
 
   # Confirm relationships between RPM-related resources
-  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-3-candidate]') }
-  it { should contain_yumrepo('opendaylight-3-candidate').that_comes_before('Package[opendaylight]') }
+  it { should contain_package('opendaylight').that_requires('Yumrepo[opendaylight-4-testing]') }
+  it { should contain_yumrepo('opendaylight-4-testing').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-3-candidate').with(
+    should contain_yumrepo('opendaylight-4-testing').with(
       'enabled'     => '1',
       'gpgcheck'    => '0',
-      'descr'       => 'CentOS CBS OpenDaylight Lithium candidate repository',
+      'descr'       => 'CentOS CBS OpenDaylight Berillium testing repository',
       'baseurl'     => yum_repo,
     )
   }
@@ -313,7 +313,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-3-candidate') }.to raise_error(Puppet::Error, /#{expected_msg}/) }
+  it { expect { should contain_yumrepo('opendaylight-4-testing') }.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 69e297f7de7a613b56496e586c705fabad2dcd6b..53677200b068a065a04b7564e5444d470677778c 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -216,7 +216,7 @@ end
 
 # Shared function that handles validations specific to RPM-type installs
 def rpm_validations()
-  describe yumrepo('opendaylight-3-candidate') do
+  describe yumrepo('opendaylight-4-testing') do
     it { should exist }
     it { should be_enabled }
   end
@@ -234,7 +234,7 @@ def tarball_validations()
 
   # Repo checks break (not fail) when yum doesn't make sense (Ubuntu)
   if ['centos-7', 'fedora-20', 'fedora-21'].include? ENV['RS_SET']
-    describe yumrepo('opendaylight-3-candidate') do
+    describe yumrepo('opendaylight-4-testing') do
       it { should_not exist }
       it { should_not be_enabled }
     end

diff --git a/templates/org.apache.karaf.features.cfg.erb b/templates/org.apache.karaf.features.cfg.erb
index 7ef41cf125634ce9acf07f75766b6035a5e888f2..da1dcf836306729b61a4d4fb397a28fd3f2d4814 100644 (file)
--- a/templates/org.apache.karaf.features.cfg.erb
+++ b/templates/org.apache.karaf.features.cfg.erb
@@ -36,7 +36,7 @@
 #
 # Comma separated list of features repositories to register by default
 #
-featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.3.3-Lithium-SR3/xml/features
+featuresRepositories = mvn:org.apache.karaf.features/standard/3.0.3/xml/features,mvn:org.apache.karaf.features/enterprise/3.0.3/xml/features,mvn:org.ops4j.pax.web/pax-web-features/3.1.4/xml/features,mvn:org.apache.karaf.features/spring/3.0.3/xml/features,mvn:org.opendaylight.integration/features-integration-index/0.4.0-beryllium-daily-v201601200134/xml/features
 
 #
 # Comma separated list of features to install at startup