openstack
/
puppet-openstack_extras
Code Issues Proposed changes

Update parameters for apt::source 

Change-Id: Ibebaf17c82cf399859aa2f05df3f95bd25b81ea1
This commit is contained in:
Takashi Kajinami 2020-07-20 14:34:28 +09:00
parent 796135c858
commit d6aeb8c9ee
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spec/classes/openstack_extras_repo_debian_debian_spec.rb
View File

@ -81,8 +81,9 @@ describe 'openstack_extras::repo::debian::debian' do
'location' => 'http://apt.puppetlabs.com',
'repos' => 'main',
'release' => 'stretch',
'key' => '4BD6EC30',
'key_server' => 'pgp.mit.edu'
'key' => {
'id' => '4BD6EC30', 'server' => 'pgp.mit.edu'
}
}
}
})
@ -98,8 +99,7 @@ describe 'openstack_extras::repo::debian::debian' do
:location => 'http://apt.puppetlabs.com',
:repos => 'main',
:release => 'stretch',
:key => '4BD6EC30',
:key_server => 'pgp.mit.edu'
:key => { 'id' => '4BD6EC30', 'server' => 'pgp.mit.edu' }
)}
it { should contain_exec('installing openstack-backports-archive-keyring') }
@ -116,16 +116,16 @@ describe 'openstack_extras::repo::debian::debian' do
}
})
default_params.merge!({ :source_defaults => {
'include_src' => 'true'
'include' => { 'src' => true }
}
})
end
it { should contain_apt__source('debian_unstable').with(
:include => { 'src' => true },
:location => 'http://mymirror/debian/',
:release => 'unstable',
:repos => 'main',
:include_src => 'true'
)}
it { should contain_exec('installing openstack-backports-archive-keyring') }

12
spec/classes/openstack_extras_repo_debian_ubuntu_spec.rb
View File

@ -69,8 +69,9 @@ describe 'openstack_extras::repo::debian::ubuntu' do
'location' => 'http://apt.puppetlabs.com',
'repos' => 'main',
'release' => 'trusty',
'key' => '4BD6EC30',
'key_server' => 'pgp.mit.edu'
'key' => {
'id' => '4BD6EC30', 'server' => 'pgp.mit.edu'
}
}
}
})
@ -86,8 +87,7 @@ describe 'openstack_extras::repo::debian::ubuntu' do
:location => 'http://apt.puppetlabs.com',
:release => 'trusty',
:repos => 'main',
:key => '4BD6EC30',
:key_server => 'pgp.mit.edu'
:key => { 'id' => '4BD6EC30', 'server' => 'pgp.mit.edu' }
)}
it { should contain_exec('installing ubuntu-cloud-keyring') }
@ -104,13 +104,13 @@ describe 'openstack_extras::repo::debian::ubuntu' do
}
})
default_params.merge!({ :source_defaults => {
'include_src' => 'true'
'include' => { 'src' => true }
}
})
end
it { should contain_apt__source('local_mirror').with(
:include_src => 'true',
:include => { 'src' => true },
:location => 'http://mymirror/ubuntu/',
:release => 'trusty',
:repos => 'main',