stackforge/puppet-openstack
Code Issues Proposed changes

Add possibility to change UCA repository

Browse Source 
Instead of forcing 'updates' UCA repo, leaves possibility to the
operator to choose which UCA he wants for pulling packages

Change-Id: I3e47f8a8b280d1dfe29229e1f9905ad7c71c204d
This commit is contained in:
sbauza 2013-09-05 17:52:24 +02:00 committed by Dan Bode
parent fb9a7091d3
commit a419984dac
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/repo/uca.pp
View File

@ -1,6 +1,7 @@
# Ubuntu Cloud Archive repo (supports either Folsom or Grizzly)
class openstack::repo::uca(
$release = 'grizzly'
$release = 'grizzly',
$repo = 'updates'
) {
if ($::operatingsystem == 'Ubuntu' and
$::lsbdistdescription =~ /^.*LTS.*$/) {
@ -8,7 +9,7 @@ class openstack::repo::uca(
apt::source { 'ubuntu-cloud-archive':
location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
release => "${::lsbdistcodename}-updates/${release}",
release => "${::lsbdistcodename}-${repo}/${release}",
repos => 'main',
required_packages => 'ubuntu-cloud-keyring',
}

45
spec/classes/openstack_repo_uca_spec.rb Normal file
View File

@ -0,0 +1,45 @@
require 'spec_helper'
describe 'openstack::repo::uca' do
describe 'Ubuntu with defaults' do
let :facts do
{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '12.04',
:lsbdistdescription => 'Ubuntu 12.04.1 LTS',
:lsbdistcodename => 'precise',
}
end
it do
should contain_apt__source('ubuntu-cloud-archive').with(
:release => 'precise-updates/grizzly'
)
end
end
describe 'Ubuntu and grizzly' do
let :params do
{ :release => 'folsom', :repo => 'proposed' }
end
let :facts do
{
:osfamily => 'Debian',
:operatingsystem => 'Ubuntu',
:operatingsystemrelease => '12.04',
:lsbdistdescription => 'Ubuntu 12.04.1 LTS',
:lsbdistcodename => 'precise',
}
end
it do
should contain_apt__source('ubuntu-cloud-archive').with(
:release => 'precise-proposed/folsom'
)
end
end
end