diff --git a/manifests/repo/debian/debian.pp b/manifests/repo/debian/debian.pp index c6f42d6..7f877d2 100644 --- a/manifests/repo/debian/debian.pp +++ b/manifests/repo/debian/debian.pp @@ -6,13 +6,11 @@ # === Parameters: # # [*release*] -# (optional) The OpenStack release to add a -# Debian apt source for. -# Defaults to 'dalmatian' +# (optional) The OpenStack release to add a Debian apt source for. +# Defaults to 'epoxy' # # [*manage_deb*] -# (optional) Whether or not to add the default -# Debian APT source +# (optional) Whether or not to add the default Debian APT source # Defaults to true # # [*package_require*] @@ -41,7 +39,7 @@ # Defaults to "http://${facts['os']['distro']['codename']}-${release}.debian.net/debian" # class openstack_extras::repo::debian::debian( - String[1] $release = 'dalmatian', + String[1] $release = 'epoxy', Boolean $manage_deb = true, Boolean $package_require = false, Boolean $use_extrepo = true, diff --git a/manifests/repo/debian/ubuntu.pp b/manifests/repo/debian/ubuntu.pp index 480b5ff..80b602d 100644 --- a/manifests/repo/debian/ubuntu.pp +++ b/manifests/repo/debian/ubuntu.pp @@ -6,13 +6,13 @@ # === Parameters: # # [*release*] -# (optional) The OpenStack release to add an -# Ubuntu Cloud Archive APT source for. -# Defaults to 'dalmatian' +# (optional) The OpenStack release to add an Ubuntu Cloud Archive APT source +# for. +# Defaults to 'epoxy' # # [*manage_uca*] -# (optional) Whether or not to add the default -# Ubuntu Cloud Archive APT source +# (optional) Whether or not to add the default Ubuntu Cloud Archive APT +# source. # Defaults to true # # [*repo*] @@ -42,7 +42,7 @@ # Defaults to $::openstack_extras::repo::debian::params::uca_location # class openstack_extras::repo::debian::ubuntu( - String[1] $release = 'dalmatian', + String[1] $release = 'epoxy', Boolean $manage_uca = true, Enum['updates', 'proposed'] $repo = 'updates', Hash $source_hash = {}, diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp index 667d4ae..99d01ff 100644 --- a/manifests/repo/redhat/redhat.pp +++ b/manifests/repo/redhat/redhat.pp @@ -7,7 +7,7 @@ # # [*release*] # (Optional) The OpenStack release to use. -# Defaults to 'dalmatian' +# Defaults to 'epoxy' # # [*manage_rdo*] # (Optional) Whether to create a yumrepo resource for the @@ -72,7 +72,7 @@ # Defaults to false # class openstack_extras::repo::redhat::redhat ( - String[1] $release = 'dalmatian', + String[1] $release = 'epoxy', Boolean $manage_rdo = true, Hash $repo_hash = {}, Hash $repo_source_hash = {}, diff --git a/spec/classes/openstack_extras_repo_debian_debian_spec.rb b/spec/classes/openstack_extras_repo_debian_debian_spec.rb index 65494f2..aad9b87 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 => 'dalmatian' + :release => 'epoxy' } 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_dalmatian').with( + it { should contain_exec('/usr/bin/extrepo enable openstack_epoxy').with( :command => "/bin/true # comment to satisfy puppet syntax requirements apt-get update apt-get install -y extrepo -extrepo enable openstack_dalmatian +extrepo enable openstack_epoxy apt-get update ", )} @@ -58,14 +58,14 @@ apt-get update end it { should contain_apt__source('debian-openstack-backports').with( - :location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian", - :release => "#{facts[:os]['distro']['codename']}-dalmatian-backports", + :location => "http://#{facts[:os]['distro']['codename']}-epoxy.debian.net/debian", + :release => "#{facts[:os]['distro']['codename']}-epoxy-backports", :repos => 'main', )} it { should contain_apt__source('debian-openstack-backports-nochange').with( - :location => "http://#{facts[:os]['distro']['codename']}-dalmatian.debian.net/debian", - :release => "#{facts[:os]['distro']['codename']}-dalmatian-backports-nochange", + :location => "http://#{facts[:os]['distro']['codename']}-epoxy.debian.net/debian", + :release => "#{facts[:os]['distro']['codename']}-epoxy-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 2458ea3..e0f3e2e 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 => 'dalmatian' + :release => 'epoxy' } 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 => "#{facts[:os]['distro']['codename']}-updates/dalmatian", + :release => "#{facts[:os]['distro']['codename']}-updates/epoxy", :repos => 'main', )} @@ -130,7 +130,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 => "#{facts[:os]['distro']['codename']}-proposed/dalmatian", + :release => "#{facts[:os]['distro']['codename']}-proposed/epoxy", :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 4a153cb..1fe09de 100644 --- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb +++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb @@ -13,8 +13,8 @@ describe 'openstack_extras::repo::redhat::redhat' do :before => 'Anchor[openstack_extras_redhat]', )} it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-dalmatian/", - :descr => "OpenStack Dalmatian Repository", + :baseurl => "http://mirror.stream.centos.org/SIGs/$stream/cloud/$basearch/openstack-epoxy/", + :descr => "OpenStack Epoxy Repository", :gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud', :enabled => '1', :gpgcheck => '1', @@ -126,7 +126,7 @@ describe 'openstack_extras::repo::redhat::redhat' do end it { should contain_yumrepo('rdo-release').with( - :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-dalmatian/", + :baseurl => "http://foo.bar/SIGs/$stream/cloud/$basearch/openstack-epoxy/", )} end