Merge branch 'template_deprecation_warnings'
* template_deprecation_warnings: Update travis.yml to latest versions of puppet Remove deprecation warnings for pin.pref.erb as well add @ to variables in template
This commit is contained in:
commit
4f83e75083
5 changed files with 15 additions and 11 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
|||
*.swp
|
||||
pkg/
|
||||
Gemfile.lock
|
||||
spec/fixtures/manifests
|
||||
|
|
|
@ -10,10 +10,13 @@ env:
|
|||
- PUPPET_GEM_VERSION="~> 2.7.0"
|
||||
- PUPPET_GEM_VERSION="~> 3.0.0"
|
||||
- PUPPET_GEM_VERSION="~> 3.1.0"
|
||||
- PUPPET_GEM_VERSION="~> 3.2.0"
|
||||
matrix:
|
||||
allow_failures:
|
||||
- rvm: ruby-head
|
||||
exclude:
|
||||
- rvm: ruby-head
|
||||
env: PUPPET_GEM_VERSION="~> 3.0.0"
|
||||
- rvm: ruby-head
|
||||
env: PUPPET_GEM_VERSION="~> 3.1.0"
|
||||
- rvm: 1.9.3
|
||||
env: PUPPET_GEM_VERSION="~> 2.7.0"
|
||||
- rvm: ruby-head
|
||||
|
|
0
spec/fixtures/manifests/site.pp
vendored
0
spec/fixtures/manifests/site.pp
vendored
|
@ -1,5 +1,5 @@
|
|||
# <%= name %>
|
||||
Explanation: <%= explanation %>
|
||||
Package: <%= packages %>
|
||||
Pin: <%= pin %>
|
||||
Pin-Priority: <%= priority %>
|
||||
# <%= @name %>
|
||||
Explanation: <%= @explanation %>
|
||||
Package: <%= @packages %>
|
||||
Pin: <%= @pin %>
|
||||
Pin-Priority: <%= @priority %>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# <%= name %>
|
||||
deb <%= location %> <%= release_real %> <%= repos %>
|
||||
<%- if include_src then -%>
|
||||
deb-src <%= location %> <%= release_real %> <%= repos %>
|
||||
# <%= @name %>
|
||||
deb <%= @location %> <%= @release_real %> <%= @repos %>
|
||||
<%- if @include_src then -%>
|
||||
deb-src <%= @location %> <%= @release_real %> <%= @repos %>
|
||||
<%- end -%>
|
||||
|
|
Loading…
Reference in a new issue