x/puppet-midonet
Code Issues Proposed changes

Dont use deprecated params for ubuntu repos

Browse Source 
Change-Id: I10d487759577838660575738ecc3d8b107e6dc19
This commit is contained in:
Alex Ruiz Estradera 2016-09-09 18:34:11 +02:00
parent f634605551
commit ef7a5b184b
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/repository/ubuntu.pp
View File

@ -70,17 +70,21 @@ class midonet::repository::ubuntu (
}
apt::source {'midonet-openstack-integration':
comment => 'Midonet apt plugin repository',
location => "http://${midonet::params::midonet_repo_baseurl}/openstack-${openstack_release}",
release => $midonet_stage,
include_src => false,
comment => 'Midonet apt plugin repository',
location => "http://${midonet::params::midonet_repo_baseurl}/openstack-${openstack_release}",
release => $midonet_stage,
include => {
'src' => false,
}
}
apt::source {'midonet-openstack-misc':
comment => 'Midonet 3rd party tools and libraries',
location => "http://${midonet::params::midonet_repo_baseurl}/misc",
release => $midonet_stage,
include_src => false,
comment => 'Midonet 3rd party tools and libraries',
location => "http://${midonet::params::midonet_repo_baseurl}/misc",
release => $midonet_stage,
include => {
'src' => false,
}
}
# Dummy exec to wrap apt_update

8
spec/classes/midonet_repository_ubuntu_spec.rb
View File

@ -36,13 +36,13 @@ describe 'midonet::repository::ubuntu' do
it { is_expected.to contain_apt__source('midonet-openstack-integration').with(
'location' => 'http://builds.midonet.org/openstack-mitaka',
'release' => 'stable',
'include_src' => 'false'
'include' => '{"src"=>false}'
)
}
it { is_expected.to contain_apt__source('midonet-openstack-misc').with(
'location' => 'http://builds.midonet.org/misc',
'release' => 'stable',
'include_src' => 'false'
'include' => '{"src"=>false}'
)
}
it { is_expected.to contain_exec('update-midonet-repos').with(
@ -87,13 +87,13 @@ describe 'midonet::repository::ubuntu' do
it { is_expected.to contain_apt__source('midonet-openstack-integration').with(
'location' => 'http://builds.midonet.org/openstack-mitaka',
'release' => 'stable',
'include_src' => 'false'
'include' => '{"src"=>false}'
)
}
it { is_expected.to contain_apt__source('midonet-openstack-misc').with(
'location' => 'http://builds.midonet.org/misc',
'release' => 'stable',
'include_src' => 'false'
'include' => '{"src"=>false}'
)
}
it { is_expected.to contain_exec('update-midonet-repos').with(