Merge "Replace vcsrepo with git_resource"
This commit is contained in:
commit
73848385c3
|
@ -192,11 +192,10 @@ class ironic::bifrost (
|
||||||
|
|
||||||
include ::ironic::deps
|
include ::ironic::deps
|
||||||
|
|
||||||
vcsrepo { $git_dest_repo_folder:
|
git { $git_dest_repo_folder:
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
provider => git,
|
branch => $revision,
|
||||||
revision => $revision,
|
origin => $git_source_repo,
|
||||||
source => $git_source_repo,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
file { $bifrost_config_folder:
|
file { $bifrost_config_folder:
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
"version_requirement": ">=14.4.0 <15.0.0"
|
"version_requirement": ">=14.4.0 <15.0.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "puppetlabs/vcsrepo",
|
"name": "voxpupuli/git_resource",
|
||||||
"version_requirement": ">=2.4.0 <3.0.0"
|
"version_requirement": ">=1.0.2 <2.0.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "openstack/oslo",
|
"name": "openstack/oslo",
|
||||||
|
|
|
@ -59,11 +59,10 @@ describe 'ironic::bifrost' do
|
||||||
end
|
end
|
||||||
|
|
||||||
shared_examples 'ironic::bifrost' do
|
shared_examples 'ironic::bifrost' do
|
||||||
it { should contain_vcsrepo('/opt/stack/bifrost').with(
|
it { should contain_git('/opt/stack/bifrost').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:provider => 'git',
|
:branch => 'master',
|
||||||
:revision => 'master',
|
:origin => 'https://git.openstack.org/openstack/bifrost',
|
||||||
:source => 'https://git.openstack.org/openstack/bifrost',
|
|
||||||
)}
|
)}
|
||||||
|
|
||||||
it { should contain_file('/etc/bifrost').with(
|
it { should contain_file('/etc/bifrost').with(
|
||||||
|
|
Loading…
Reference in New Issue