diff --git a/manifests/bifrost.pp b/manifests/bifrost.pp index baed7e0c..bf90b5dd 100644 --- a/manifests/bifrost.pp +++ b/manifests/bifrost.pp @@ -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: diff --git a/metadata.json b/metadata.json index c49e0626..7745b2bd 100644 --- a/metadata.json +++ b/metadata.json @@ -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", diff --git a/spec/classes/ironic_bifrost_spec.rb b/spec/classes/ironic_bifrost_spec.rb index 4e15c3eb..856a69a3 100644 --- a/spec/classes/ironic_bifrost_spec.rb +++ b/spec/classes/ironic_bifrost_spec.rb @@ -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(