From f9add6fc032ebfb7764d9e002e4439f80c86c13a Mon Sep 17 00:00:00 2001
From: Christian Rohmann <christian.rohmann@inovex.de>
Date: Wed, 4 Jan 2023 13:25:50 +0100
Subject: [PATCH] Ubuntu/Debian: Switch to zed

Change-Id: Ib6e1d3e2293749a95e814720ec6db222a371e564
---
 manifests/repo/debian/params.pp                    |  2 +-
 .../openstack_extras_repo_debian_debian_spec.rb    | 14 +++++++-------
 .../openstack_extras_repo_debian_ubuntu_spec.rb    |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifests/repo/debian/params.pp b/manifests/repo/debian/params.pp
index 6b5d27c..9a32753 100644
--- a/manifests/repo/debian/params.pp
+++ b/manifests/repo/debian/params.pp
@@ -4,7 +4,7 @@
 #
 class openstack_extras::repo::debian::params
 {
-  $release               = 'yoga'
+  $release               = 'zed'
 
   $uca_name              = 'ubuntu-cloud-archive'
   $uca_location          = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'
diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb
index 9feee37..cc8e079 100644
--- a/spec/classes/openstack_extras_repo_debian_debian_spec.rb
+++ b/spec/classes/openstack_extras_repo_debian_debian_spec.rb
@@ -14,7 +14,7 @@ describe 'openstack_extras::repo::debian::debian' do
 
     let :paramclass_defaults do
       {
-        :release => 'yoga'
+        :release => 'zed'
       }
     end
 
@@ -23,11 +23,11 @@ describe 'openstack_extras::repo::debian::debian' do
     end
 
     context 'with default params' do
-      it { should contain_exec('/usr/bin/extrepo enable openstack_yoga').with(
+      it { should contain_exec('/usr/bin/extrepo enable openstack_zed').with(
         :command => "/bin/true # comment to satisfy puppet syntax requirements
 apt-get update
 apt-get install -y extrepo
-extrepo enable openstack_yoga
+extrepo enable openstack_zed
 apt-get update
 ",
       )}
@@ -58,14 +58,14 @@ apt-get update
       end
 
       it { should contain_apt__source('debian-openstack-backports').with(
-        :location => 'http://stretch-yoga.debian.net/debian',
-        :release  => 'stretch-yoga-backports',
+        :location => 'http://stretch-zed.debian.net/debian',
+        :release  => 'stretch-zed-backports',
         :repos    => 'main',
       )}
 
       it { should contain_apt__source('debian-openstack-backports-nochange').with(
-        :location => 'http://stretch-yoga.debian.net/debian',
-        :release  => 'stretch-yoga-backports-nochange',
+        :location => 'http://stretch-zed.debian.net/debian',
+        :release  => 'stretch-zed-backports-nochange',
         :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 2a82883..6b3abc7 100644
--- a/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
+++ b/spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
@@ -13,7 +13,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
     let :paramclass_defaults do
       {
-        :release => 'yoga'
+        :release => 'zed'
       }
     end
 
@@ -28,7 +28,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
       it { should contain_apt__source('ubuntu-cloud-archive').with(
         :location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
-        :release  => 'trusty-updates/yoga',
+        :release  => 'trusty-updates/zed',
         :repos    => 'main',
       )}
 
@@ -127,7 +127,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
 
       it { should contain_apt__source('ubuntu-cloud-archive').with(
         :location => 'http://mirror.dfw.rax.openstack.org/ubuntu-cloud-archive',
-        :release  => 'trusty-proposed/yoga',
+        :release  => 'trusty-proposed/zed',
         :repos    => 'main',
       )}
     end