opuppet/module-puppetdb
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #74 from kbarber/ticket/master/GH-73-cprice-inifile-deprecated

Browse source 
(GH-73) Switch to puppetlabs/inifile from cprice/inifile
This commit is contained in:
Ken Barber 2013-10-04 04:31:41 -07:00
commit 73c1d655b8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.fixtures.yml
View file

@ -1,6 +1,6 @@
fixtures: fixtures:
repositories: repositories:
inifile: 'git://github.com/cprice-puppet/puppetlabs-inifile.git' inifile: 'git://github.com/puppetlabs/puppetlabs-inifile.git'
stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git' stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
postgresql: 'git://github.com/puppetlabs/puppet-postgresql.git' postgresql: 'git://github.com/puppetlabs/puppet-postgresql.git'
firewall: 'git://github.com/puppetlabs/puppetlabs-firewall.git' firewall: 'git://github.com/puppetlabs/puppetlabs-firewall.git'

2
Modulefile
View file

@ -7,7 +7,7 @@ summary 'PuppetDB resource types'
license 'ASL 2.0' license 'ASL 2.0'
project_page 'https://github.com/puppetlabs/puppetlabs-puppetdb' project_page 'https://github.com/puppetlabs/puppetlabs-puppetdb'
dependency 'cprice404/inifile', '>= 0.10.3' dependency 'puppetlabs/inifile', '1.x'
dependency 'puppetlabs/postgresql', '2.x' dependency 'puppetlabs/postgresql', '2.x'
dependency 'puppetlabs/firewall', '>= 0.0.4' dependency 'puppetlabs/firewall', '>= 0.0.4'
dependency 'puppetlabs/stdlib', '>= 2.2.0' dependency 'puppetlabs/stdlib', '>= 2.2.0'

2
spec/system/basic_spec.rb
View file

@ -30,7 +30,7 @@ class { 'puppetdb::master::config': }
system_run('puppet module install puppetlabs/stdlib') system_run('puppet module install puppetlabs/stdlib')
system_run('puppet module install puppetlabs/postgresql') system_run('puppet module install puppetlabs/postgresql')
system_run('puppet module install puppetlabs/firewall') system_run('puppet module install puppetlabs/firewall')
system_run('puppet module install cprice404/inifile') system_run('puppet module install puppetlabs/inifile')
puppet_apply(pp) do |r| puppet_apply(pp) do |r|
r[:exit_code].should_not eq(1) r[:exit_code].should_not eq(1)