Merge "Replace vcsrepo with git_resource"

This commit is contained in:
Zuul 2019-03-21 02:49:01 +00:00 committed by Gerrit Code Review
commit 73848385c3
3 changed files with 10 additions and 12 deletions

View File

@ -192,11 +192,10 @@ class ironic::bifrost (
include ::ironic::deps
vcsrepo { $git_dest_repo_folder:
ensure => $ensure,
provider => git,
revision => $revision,
source => $git_source_repo,
git { $git_dest_repo_folder:
ensure => $ensure,
branch => $revision,
origin => $git_source_repo,
}
file { $bifrost_config_folder:

View File

@ -26,8 +26,8 @@
"version_requirement": ">=14.4.0 <15.0.0"
},
{
"name": "puppetlabs/vcsrepo",
"version_requirement": ">=2.4.0 <3.0.0"
"name": "voxpupuli/git_resource",
"version_requirement": ">=1.0.2 <2.0.0"
},
{
"name": "openstack/oslo",

View File

@ -59,11 +59,10 @@ describe 'ironic::bifrost' do
end
shared_examples 'ironic::bifrost' do
it { should contain_vcsrepo('/opt/stack/bifrost').with(
:ensure => 'present',
:provider => 'git',
:revision => 'master',
:source => 'https://git.openstack.org/openstack/bifrost',
it { should contain_git('/opt/stack/bifrost').with(
:ensure => 'present',
:branch => 'master',
:origin => 'https://git.openstack.org/openstack/bifrost',
)}
it { should contain_file('/etc/bifrost').with(