Add Gemfile and puppet 4 checks
In anticipation of puppet 4, start trying to deal with puppet 4 things that can be helpfully predicted by puppet lint plugins. This patch also fixes lint errors caught by the puppet-lint-absolute_classname-check gem. Change-Id: Ia6fdc921b4c4a8ec2d5f6a6dfe9669704eafc67b
This commit is contained in:
parent
38e49e9efc
commit
b406ffcdd6
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
Gemfile.lock
|
||||
.bundled_gems/
|
31
Gemfile
Normal file
31
Gemfile
Normal file
@ -0,0 +1,31 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
group :development, :test do
|
||||
gem 'puppetlabs_spec_helper', :require => false
|
||||
|
||||
gem 'metadata-json-lint'
|
||||
# This is nice and all, but let's not worry about it until we've actually
|
||||
# got puppet 4.x sorted
|
||||
# gem 'puppet-lint-param-docs'
|
||||
gem 'puppet-lint-absolute_classname-check'
|
||||
gem 'puppet-lint-absolute_template_path'
|
||||
gem 'puppet-lint-trailing_newline-check'
|
||||
|
||||
# Puppet 4.x related lint checks
|
||||
gem 'puppet-lint-unquoted_string-check'
|
||||
gem 'puppet-lint-empty_string-check'
|
||||
gem 'puppet-lint-leading_zero-check'
|
||||
gem 'puppet-lint-variable_contains_upcase'
|
||||
gem 'puppet-lint-numericvariable'
|
||||
gem 'puppet-lint-spaceship_operator_without_tag-check'
|
||||
gem 'puppet-lint-undef_in_function-check'
|
||||
|
||||
if puppetversion = ENV['PUPPET_GEM_VERSION']
|
||||
gem 'puppet', puppetversion, :require => false
|
||||
else
|
||||
gem 'puppet', '~> 3.0', :require => false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
# vim:ft=ruby
|
@ -24,9 +24,9 @@ class apps_site (
|
||||
]
|
||||
}
|
||||
|
||||
include apache
|
||||
include ::apache
|
||||
|
||||
apache::vhost { $vhost_name:
|
||||
::apache::vhost { $vhost_name:
|
||||
port => 80,
|
||||
docroot => "${root_dir}/openstack_catalog/web",
|
||||
priority => '50',
|
||||
|
Loading…
x
Reference in New Issue
Block a user