add puppetlabs-concat dependency
This commit is contained in:
parent
9a39249e1a
commit
2459844373
9 changed files with 15 additions and 0 deletions
|
@ -9,3 +9,4 @@ project_page 'http://github.com/jfryman/puppet-nginx'
|
|||
|
||||
dependency 'puppetlabs/stdlib', '>= 0.1.6'
|
||||
dependency 'puppetlabs/apt', '>= 1.0.0'
|
||||
dependency 'puppetlabs/concat', '>= 1.0.0'
|
||||
|
|
|
@ -2,3 +2,4 @@ forge 'http://forge.puppetlabs.com'
|
|||
|
||||
mod 'puppetlabs/stdlib', '>=0.1.6'
|
||||
mod 'puppetlabs/apt', '>=1.0.0'
|
||||
mod 'puppetlabs/concat', '>=1.0.0'
|
||||
|
|
|
@ -3,9 +3,11 @@ FORGE
|
|||
specs:
|
||||
puppetlabs/apt (1.2.0)
|
||||
puppetlabs/stdlib (>= 2.2.1)
|
||||
puppetlabs/concat (1.0.0)
|
||||
puppetlabs/stdlib (4.1.0)
|
||||
|
||||
DEPENDENCIES
|
||||
puppetlabs/apt (>= 1.0.0)
|
||||
puppetlabs/concat (>= 1.0.0)
|
||||
puppetlabs/stdlib (>= 0.1.6)
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ describe 'nginx' do
|
|||
:operatingsystem => 'Debian',
|
||||
:osfamily => 'Debian',
|
||||
:lsbdistcodename => 'precise',
|
||||
:concat_basedir => '/var/lib/puppet/concat',
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -34,6 +35,7 @@ describe 'nginx' do
|
|||
:kernel => 'linux',
|
||||
:operatingsystem => 'RedHat',
|
||||
:osfamily => 'RedHat',
|
||||
:concat_basedir => '/var/lib/puppet/concat',
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -52,6 +54,7 @@ describe 'nginx' do
|
|||
:kernel => 'linux',
|
||||
:operatingsystem => 'SuSE',
|
||||
:osfamily => 'Suse',
|
||||
:concat_basedir => '/var/lib/puppet/concat',
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ describe 'nginx::resource::location' do
|
|||
:osfamily => 'Debian',
|
||||
:operatingsystem => 'debian',
|
||||
:kernel => 'Linux',
|
||||
:concat_basedir => '/var/lib/puppet/concat',
|
||||
}
|
||||
end
|
||||
let :pre_condition do
|
||||
|
|
|
@ -10,6 +10,7 @@ describe 'nginx::resource::mailhost' do
|
|||
:operatingsystem => 'debian',
|
||||
:kernel => 'Linux',
|
||||
:ipaddress6 => '::',
|
||||
:concat_basedir => '/var/lib/puppet/concat',
|
||||
}
|
||||
end
|
||||
let :default_params do
|
||||
|
|
|
@ -5,6 +5,10 @@ describe 'nginx::resource::upstream' do
|
|||
'upstream-test'
|
||||
end
|
||||
|
||||
let :facts do {
|
||||
:concat_basedir => '/var/lib/puppet/concat',
|
||||
} end
|
||||
|
||||
let :default_params do
|
||||
{
|
||||
:members => ['test'],
|
||||
|
|
|
@ -16,6 +16,7 @@ describe 'nginx::resource::vhost' do
|
|||
:operatingsystem => 'debian',
|
||||
:kernel => 'Linux',
|
||||
:ipaddress6 => '::',
|
||||
:concat_basedir => '/var/lib/puppet/concat',
|
||||
}
|
||||
end
|
||||
let :pre_condition do
|
||||
|
|
|
@ -21,6 +21,7 @@ RSpec.configure do |c|
|
|||
puppet_module_install(:source => proj_root, :module_name => 'nginx')
|
||||
shell('puppet module install puppetlabs-apt')
|
||||
shell('puppet module install puppetlabs-stdlib')
|
||||
shell('puppet module install puppetlabs-concat')
|
||||
|
||||
# Fake keys.
|
||||
# Valid self-signed SSL key with 10 year expiry.
|
||||
|
|
Loading…
Reference in a new issue