Replace vcsrepo with git_resource

Change-Id: I310287aacf752f03852c4f3e52a0fef4cccc5407
Depends-On: https://review.openstack.org/#/c/638726/
This commit is contained in:
Alex Schultz 2019-02-22 10:46:13 -07:00
parent 3bedda7cf1
commit dcb77fbc21
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.2.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(