From 46525780e90870d22d532d24f120ac413e6a6f97 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 24 Jan 2017 21:20:02 -0500
Subject: [PATCH] Bump default release to Ocata

Bump default releases of repos from newton to ocata.

Change-Id: Id0b0aa2d5c17740d92976cdfe41b2b213ced1cd6
---
 manifests/repo/debian/params.pp                        |  2 +-
 manifests/repo/redhat/params.pp                        |  2 +-
 .../openstack_extras_repo_debian_debian_spec.rb        |  6 +++---
 .../openstack_extras_repo_debian_ubuntu_spec.rb        |  6 +++---
 .../openstack_extras_repo_redhat_redhat_spec.rb        | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp
index 39294d8..2ae3acf 100644
--- a/manifests/repo/debian/params.pp
+++ b/manifests/repo/debian/params.pp
@@ -4,7 +4,7 @@
 #
 class openstack_extras::repo::debian::params
 {
-  $release               = 'newton'
+  $release               = 'ocata'
 
   $uca_name              = 'ubuntu-cloud-archive'
   $uca_location          = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'
diff --git a/manifests/repo/redhat/params.pp b/manifests/repo/redhat/params.pp
index c07236a..78713d0 100644
--- a/manifests/repo/redhat/params.pp
+++ b/manifests/repo/redhat/params.pp
@@ -5,7 +5,7 @@
 #
 class openstack_extras::repo::redhat::params
 {
-  $release          = 'newton'
+  $release          = 'ocata'
 
   $repo_defaults    = { 'enabled'    => '1',
                         'gpgcheck'   => '1',
diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb
index bf5c8c8..de0faf5 100644
--- a/spec/classes/openstack_extras_repo_debian_debian_spec.rb
+++ b/spec/classes/openstack_extras_repo_debian_debian_spec.rb
@@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::debian' do
 
   let :paramclass_defaults do
     {
-      :release        => 'newton'
+      :release        => 'ocata'
     }
   end
 
@@ -37,13 +37,13 @@ describe 'openstack_extras::repo::debian::debian' do
 
       it { is_expected.to contain_apt__source('debian_wheezy').with(
         :location           => 'http://archive.gplhost.com/debian',
-        :release            => 'newton',
+        :release            => 'ocata',
         :repos              => 'main',
       )}
 
       it { is_expected.to contain_apt__source('debian_wheezy_backports').with(
         :location => 'http://archive.gplhost.com/debian',
-        :release  => 'newton-backports',
+        :release  => 'ocata-backports',
         :repos    => 'main'
       )}
 
diff --git a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
index f40e1bc..dfdaed3 100644
--- a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
+++ b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
@@ -12,7 +12,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
   let :paramclass_defaults do
     {
-      :release        => 'newton'
+      :release        => 'ocata'
     }
   end
 
@@ -38,7 +38,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
       it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with(
         :location           => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
-        :release            => 'trusty-updates/newton',
+        :release            => 'trusty-updates/ocata',
         :repos              => 'main',
       )}
 
@@ -138,7 +138,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
       it { is_expected.to contain_apt__source('ubuntu-cloud-archive').with(
         :location           => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive',
-        :release            => 'trusty-proposed/newton',
+        :release            => 'trusty-proposed/ocata',
         :repos              => 'main',
       )}
     end
diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
index 1719968..cfdfd1d 100644
--- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
+++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
@@ -14,7 +14,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
 
   let :paramclass_defaults do
     {
-      :release        => 'newton',
+      :release        => 'ocata',
       :repo_defaults  => { 'enabled' => '1',
                            'gpgcheck' => '1',
                            'notify' => "Exec[yum_refresh]",
@@ -50,8 +50,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { is_expected.to contain_yumrepo('rdo-release').with(
-        :baseurl    => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-newton/",
-        :descr      => "OpenStack Newton Repository",
+        :baseurl    => "http://mirror.centos.org/centos/7/cloud/$basearch/openstack-ocata/",
+        :descr      => "OpenStack Ocata Repository",
         :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud",
         :enabled    => '1',
         :gpgcheck   => '1',
@@ -191,8 +191,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { is_expected.to contain_yumrepo('rdo-release').with(
-        :baseurl    => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-newton/",
-        :descr      => "OpenStack Newton Repository",
+        :baseurl    => "http://mirror.dfw.rax.openstack.org/centos/7/cloud/\$basearch/openstack-ocata/",
+        :descr      => "OpenStack Ocata Repository",
         :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud",
         :proxy     => "http://my.proxy.com:8000"
       )}