openstack
/
puppet-ironic
Code Issues Proposed changes

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
parent 639f42d839 dcb77fbc21
commit 73848385c3
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/bifrost.pp
View File

@ -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:

4
metadata.json
View File

@ -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",

7
spec/classes/ironic_bifrost_spec.rb
View File

@ -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(